Fix version issue

Signed-off-by: Rishab Nahata <[email protected]>
opensearch-project · Jan 26, 2023 · 69495e0 · 69495e0
1 parent 2f9ea8a
commit 69495e0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/...main/java/org/opensearch/action/support/clustermanager/ClusterManagerNodeReadRequest.java b/...main/java/org/opensearch/action/support/clustermanager/ClusterManagerNodeReadRequest.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.action.support.clustermanager;
 
+import org.opensearch.Version;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 
@@ -53,14 +54,18 @@ protected ClusterManagerNodeReadRequest() {}
  protected ClusterManagerNodeReadRequest(StreamInput in) throws IOException {
  super(in);
  local = in.readBoolean();
- ensureLocalNodeCommissioned = in.readBoolean();
+ if (in.getVersion().onOrAfter(Version.V_2_6_0)) {
+ ensureLocalNodeCommissioned = in.readBoolean();
+ }
  }
 
  @Override
  public void writeTo(StreamOutput out) throws IOException {
  super.writeTo(out);
  out.writeBoolean(local);
- out.writeBoolean(ensureLocalNodeCommissioned);
+ if (out.getVersion().onOrAfter(Version.V_2_6_0)) {
+ out.writeBoolean(ensureLocalNodeCommissioned);
+ }
  }
 
  @SuppressWarnings("unchecked")

diff --git a/...r/src/test/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestTests.java b/...r/src/test/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestTests.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.action.admin.cluster.health;
 
+import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.common.Priority;
@@ -70,6 +71,23 @@ public void testRequestReturnsHiddenIndicesByDefault() {
  assertTrue(defaultRequest.indicesOptions().expandWildcardsHidden());
  }
 
+ public void testValidation() {
+ ClusterHealthRequest clusterHealthRequest = randomRequest();
+ {
+ clusterHealthRequest.local(false);
+ clusterHealthRequest.ensureLocalNodeCommissioned(true);
+ ActionRequestValidationException e = clusterHealthRequest.validate();
+ assertNotNull(e);
+ assertTrue(e.getMessage().contains("not a local request to ensure local node commissioned"));
+ }
+ {
+ clusterHealthRequest.local(true);
+ clusterHealthRequest.ensureLocalNodeCommissioned(false);
+ ActionRequestValidationException e = clusterHealthRequest.validate();
+ assertNull(e);
+ }
+ }
+
  private ClusterHealthRequest randomRequest() {
  ClusterHealthRequest request = new ClusterHealthRequest();
  request.waitForStatus(randomFrom(ClusterHealthStatus.values()));