Revert "Change version from CURRENT to 2.17.0"

This reverts commit c7a148a. Signed-off-by: Sachin Kale <[email protected]>
sachinpkale · Sep 3, 2024 · 529db89 · 529db89
1 parent f471deb
commit 529db89
Show file tree

Hide file tree

Showing 3 changed files with 22 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.V_2_17_0)) {
+        if (in.getVersion().onOrAfter(Version.CURRENT)) {
             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.V_2_17_0)) {
+        if (out.getVersion().onOrAfter(Version.CURRENT)) {
             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,6 +48,8 @@
 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>
@@ -333,7 +335,7 @@ public SnapshotRecoverySource(
                 remoteStoreIndexShallowCopy = false;
                 sourceRemoteStoreRepository = null;
             }
-            if (in.getVersion().onOrAfter(Version.V_2_17_0)) {
+            if (in.getVersion().onOrAfter(CURRENT)) {
                 sourceRemoteTranslogRepository = in.readOptionalString();
                 pinnedTimestamp = in.readLong();
             } else {
@@ -397,7 +399,7 @@ protected void writeAdditionalFields(StreamOutput out) throws IOException {
                 out.writeBoolean(remoteStoreIndexShallowCopy);
                 out.writeOptionalString(sourceRemoteStoreRepository);
             }
-            if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
+            if (out.getVersion().onOrAfter(CURRENT)) {
                 out.writeOptionalString(sourceRemoteTranslogRepository);
                 out.writeLong(pinnedTimestamp);
             }

diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -2913,9 +2913,23 @@ public void restoreFromSnapshotAndRemoteStore(
             StoreRecovery storeRecovery = new StoreRecovery(shardId, logger);
             SnapshotRecoverySource recoverySource = (SnapshotRecoverySource) recoveryState().getRecoverySource();
             if (recoverySource.pinnedTimestamp() != 0) {
-                storeRecovery.recoverShallowSnapshotV2(this, repository, repositoriesService, listener, remoteStoreSettings.getSegmentsPathFixedPrefix(), threadPool);
+                storeRecovery.recoverShallowSnapshotV2(
+                    this,
+                    repository,
+                    repositoriesService,
+                    listener,
+                    remoteStoreSettings.getSegmentsPathFixedPrefix(),
+                    threadPool
+                );
             } else {
-                storeRecovery.recoverFromSnapshotAndRemoteStore(this, repository, repositoriesService, listener, remoteStoreSettings.getSegmentsPathFixedPrefix(), threadPool);
+                storeRecovery.recoverFromSnapshotAndRemoteStore(
+                    this,
+                    repository,
+                    repositoriesService,
+                    listener,
+                    remoteStoreSettings.getSegmentsPathFixedPrefix(),
+                    threadPool
+                );
             }
         } catch (Exception e) {
             listener.onFailure(e);