Update version check for context to comply with backport

Signed-off-by: Mohit Godwani <mgodwan@amazon.com>
opensearch-project · Sep 2, 2024 · 1d00a68 · 1d00a68
1 parent e3f8a38
commit 1d00a68
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/server/src/main/java/org/opensearch/OpenSearchServerException.java b/server/src/main/java/org/opensearch/OpenSearchServerException.java
@@ -13,6 +13,7 @@
 import static org.opensearch.OpenSearchException.UNKNOWN_VERSION_ADDED;
 import static org.opensearch.Version.V_2_10_0;
 import static org.opensearch.Version.V_2_13_0;
+import static org.opensearch.Version.V_2_17_0;
 import static org.opensearch.Version.V_2_1_0;
 import static org.opensearch.Version.V_2_4_0;
 import static org.opensearch.Version.V_2_5_0;
@@ -1206,7 +1207,7 @@ public static void registerExceptions() {
                 org.opensearch.indices.InvalidIndexContextException.class,
                 org.opensearch.indices.InvalidIndexContextException::new,
                 174,
-                V_3_0_0
+                V_2_17_0
             )
         );
         registerExceptionHandle(

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/create/CreateIndexRequest.java
@@ -132,7 +132,7 @@ public CreateIndexRequest(StreamInput in) throws IOException {
             aliases.add(new Alias(in));
         }
         waitForActiveShards = ActiveShardCount.readFrom(in);
-        if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_2_17_0)) {
             context = in.readOptionalWriteable(Context::new);
         }
     }
@@ -632,7 +632,7 @@ public void writeTo(StreamOutput out) throws IOException {
             alias.writeTo(out);
         }
         waitForActiveShards.writeTo(out);
-        if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
             out.writeOptionalWriteable(context);
         }
     }

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/get/GetIndexResponse.java
@@ -167,7 +167,7 @@ public GetIndexResponse(
         }
         dataStreams = Collections.unmodifiableMap(dataStreamsMapBuilder);
 
-        if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_2_17_0)) {
             final Map<String, Context> contextMapBuilder = new HashMap<>();
             int contextSize = in.readVInt();
             for (int i = 0; i < contextSize; i++) {
@@ -297,7 +297,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeOptionalString(indexEntry.getValue());
         }
 
-        if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
             out.writeVInt(contexts.size());
             for (final Map.Entry<String, Context> indexEntry : contexts.entrySet()) {
                 out.writeString(indexEntry.getKey());

diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java
@@ -1105,7 +1105,7 @@ private static class IndexMetadataDiff implements Diff<IndexMetadata> {
             );
             rolloverInfos = DiffableUtils.readJdkMapDiff(in, DiffableUtils.getStringKeySerializer(), ROLLOVER_INFO_DIFF_VALUE_READER);
             isSystem = in.readBoolean();
-            if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+            if (in.getVersion().onOrAfter(Version.V_2_17_0)) {
                 context = in.readOptionalWriteable(Context::new);
             } else {
                 context = null;
@@ -1129,7 +1129,7 @@ public void writeTo(StreamOutput out) throws IOException {
             inSyncAllocationIds.writeTo(out);
             rolloverInfos.writeTo(out);
             out.writeBoolean(isSystem);
-            if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+            if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
                 out.writeOptionalWriteable(context);
             }
         }
@@ -1194,7 +1194,7 @@ public static IndexMetadata readFrom(StreamInput in) throws IOException {
         }
         builder.system(in.readBoolean());
 
-        if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_2_17_0)) {
             builder.context(in.readOptionalWriteable(Context::new));
         }
         return builder.build();
@@ -1235,7 +1235,7 @@ public void writeTo(StreamOutput out) throws IOException {
         }
         out.writeBoolean(isSystem);
 
-        if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_2_17_0)) {
             out.writeOptionalWriteable(context);
         }
     }