Fix up BWC for serialization of GetIndexResponse (elastic#56274)

Completes the backport of elastic#56022 Closes elastic#56265
bhagya7977 · May 6, 2020 · f4d970a · f4d970a
1 parent 4aa46a6
commit f4d970a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java b/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java
@@ -431,7 +431,6 @@ public void testRecoveryClosedIndex() throws Exception {
      * is effectively closed and potentially replicated if the cluster supports replication of closed indices at the
      * time the index was closed.
      */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/56265")
     public void testCloseIndexDuringRollingUpgrade() throws Exception {
         final Version minimumNodeVersion = minimumNodeVersion();
         final String indexName =

diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexResponse.java
@@ -132,7 +132,7 @@ public GetIndexResponse(String[] indices,
         }
         defaultSettings = defaultSettingsMapBuilder.build();
 
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_7_8_0)) {
             ImmutableOpenMap.Builder<String, String> dataStreamsMapBuilder = ImmutableOpenMap.builder();
             int dataStreamsSize = in.readVInt();
             for (int i = 0; i < dataStreamsSize; i++) {
@@ -255,7 +255,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeString(indexEntry.key);
             Settings.writeSettingsToStream(indexEntry.value, out);
         }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
             out.writeVInt(dataStreams.size());
             for (ObjectObjectCursor<String, String> indexEntry : dataStreams) {
                 out.writeString(indexEntry.key);