Change version to 2.17.0 for shallow snapshot V2 restore changes (#15723

) Signed-off-by: Sachin Kale <kalsac@amazon.com> Co-authored-by: Sachin Kale <kalsac@amazon.com>
opensearch-project · Sep 6, 2024 · 7c9c01d · 7c9c01d
1 parent 66c7780
commit 7c9c01d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...in/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/...in/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
@@ -161,7 +161,7 @@ public RestoreSnapshotRequest(StreamInput in) throws IOException {
         if (in.getVersion().onOrAfter(Version.V_2_10_0)) {
             sourceRemoteStoreRepository = in.readOptionalString();
         }
-        if (in.getVersion().onOrAfter(Version.CURRENT)) {
+        if (in.getVersion().onOrAfter(Version.V_2_17_0)) {
             sourceRemoteTranslogRepository = in.readOptionalString();
         }
     }
@@ -188,7 +188,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getVersion().onOrAfter(Version.V_2_10_0)) {
             out.writeOptionalString(sourceRemoteStoreRepository);
         }
-        if (out.getVersion().onOrAfter(Version.CURRENT)) {
+        if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
             out.writeOptionalString(sourceRemoteTranslogRepository);
         }
     }

diff --git a/server/src/main/java/org/opensearch/cluster/routing/RecoverySource.java b/server/src/main/java/org/opensearch/cluster/routing/RecoverySource.java
@@ -48,8 +48,6 @@
 import java.io.IOException;
 import java.util.Objects;
 
-import static org.opensearch.Version.CURRENT;
-
 /**
  * Represents the recovery source of a shard. Available recovery types are:
  * <p>
@@ -335,7 +333,7 @@ public SnapshotRecoverySource(
                 remoteStoreIndexShallowCopy = false;
                 sourceRemoteStoreRepository = null;
             }
-            if (in.getVersion().onOrAfter(CURRENT)) {
+            if (in.getVersion().onOrAfter(Version.V_2_17_0)) {
                 sourceRemoteTranslogRepository = in.readOptionalString();
                 pinnedTimestamp = in.readLong();
             } else {
@@ -399,7 +397,7 @@ protected void writeAdditionalFields(StreamOutput out) throws IOException {
                 out.writeBoolean(remoteStoreIndexShallowCopy);
                 out.writeOptionalString(sourceRemoteStoreRepository);
             }
-            if (out.getVersion().onOrAfter(CURRENT)) {
+            if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
                 out.writeOptionalString(sourceRemoteTranslogRepository);
                 out.writeLong(pinnedTimestamp);
             }