Fixed comments related to version check and ClusterManagerNodeReadReq…

…uest Signed-off-by: Somesh Gupta <someshgupta987@gmail.com>
opensearch-project · Aug 30, 2024 · 6492189 · 6492189
1 parent 5705b92
commit 6492189
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 19 deletions.
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/shards/CatShardsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/shards/CatShardsRequest.java
@@ -18,8 +18,6 @@
 import java.io.IOException;
 import java.util.Map;
 
-import static org.opensearch.search.SearchService.NO_TIMEOUT;
-
 /**
  * A request of _cat/shards.
  *
@@ -41,14 +39,6 @@ public ActionRequestValidationException validate() {
         return null;
     }
 
-    public void setLocal(boolean local) {
-        this.local = local;
-    }
-
-    public boolean getLocal() {
-        return this.local;
-    }
-
     public void setIndices(String[] indices) {
         this.indices = indices;
     }

diff --git a/...er/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java b/...er/src/main/java/org/opensearch/action/admin/cluster/shards/TransportCatShardsAction.java
@@ -42,7 +42,7 @@ public TransportCatShardsAction(NodeClient client, TransportService transportSer
     public void doExecute(Task parentTask, CatShardsRequest shardsRequest, ActionListener<CatShardsResponse> listener) {
         final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
         clusterStateRequest.setShouldCancelOnTimeout(true);
-        clusterStateRequest.local(shardsRequest.getLocal());
+        clusterStateRequest.local(shardsRequest.local());
         clusterStateRequest.clusterManagerNodeTimeout(shardsRequest.clusterManagerNodeTimeout());
         clusterStateRequest.clear().nodes(true).routingTable(true).indices(shardsRequest.getIndices());
         assert parentTask instanceof CancellableTask;

diff --git a/server/src/main/java/org/opensearch/action/support/broadcast/BroadcastRequest.java b/server/src/main/java/org/opensearch/action/support/broadcast/BroadcastRequest.java
@@ -58,7 +58,6 @@ public BroadcastRequest(StreamInput in) throws IOException {
         super(in);
         indices = in.readStringArray();
         indicesOptions = IndicesOptions.readIndicesOptions(in);
-        shouldCancelOnTimeout = in.readBoolean();
     }
 
     protected BroadcastRequest(String... indices) {
@@ -126,7 +125,6 @@ public boolean includeDataStreams() {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArrayNullable(indices);
-        out.writeBoolean(shouldCancelOnTimeout);
         indicesOptions.writeIndicesOptions(out);
     }
 

diff --git a/...main/java/org/opensearch/action/support/clustermanager/ClusterManagerNodeReadRequest.java b/...main/java/org/opensearch/action/support/clustermanager/ClusterManagerNodeReadRequest.java
@@ -54,14 +54,12 @@ protected ClusterManagerNodeReadRequest() {}
     protected ClusterManagerNodeReadRequest(StreamInput in) throws IOException {
         super(in);
         local = in.readBoolean();
-        shouldCancelOnTimeout = in.readBoolean();
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeBoolean(local);
-        out.writeBoolean(shouldCancelOnTimeout);
     }
 
     @SuppressWarnings("unchecked")

diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
@@ -109,10 +109,8 @@ protected void documentation(StringBuilder sb) {
     public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
         final String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
         final CatShardsRequest shardsRequest = new CatShardsRequest();
-        shardsRequest.setLocal(request.paramAsBoolean("local", shardsRequest.local()));
-        shardsRequest.clusterManagerNodeTimeout(
-            request.paramAsTime("cluster_manager_timeout", shardsRequest.clusterManagerNodeTimeout())
-        );
+        shardsRequest.local(request.paramAsBoolean("local", shardsRequest.local()));
+        shardsRequest.clusterManagerNodeTimeout(request.paramAsTime("cluster_manager_timeout", shardsRequest.clusterManagerNodeTimeout()));
         shardsRequest.setCancelAfterTimeInterval(request.paramAsTime("cancel_after_time_interval", NO_TIMEOUT));
         shardsRequest.setIndices(indices);
         parseDeprecatedMasterTimeoutParameter(shardsRequest, request, deprecationLogger, getName());