Unset discovery nodes for every transport node actions request (#17682)

gargmanik13 · web-flow · commit 2bd3e3dcc9a9 · 2025-04-22T13:40:43.000+05:30
* Removed includeDiscoveryNodes from BaseNodesRequest

Signed-off-by: Manik Garg &lt;garmanik@amazon.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased 3.x]
 ### Added
 - Add multi-threaded writer support in pull-based ingestion ([#17912](https://github.com/opensearch-project/OpenSearch/pull/17912))
+- Unset discovery nodes for every transport node actions request ([#17682](https://github.com/opensearch-project/OpenSearch/pull/17682))
 - Implement parallel shard refresh behind cluster settings ([#17782](https://github.com/opensearch-project/OpenSearch/pull/17782))
 
 ### Changed
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
@@ -70,7 +70,7 @@ public NodesHotThreadsRequest(StreamInput in) throws IOException {
      * threads for all nodes is used.
      */
     public NodesHotThreadsRequest(String... nodesIds) {
-        super(false, nodesIds);
+        super(nodesIds);
     }
 
     public int threads() {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodesInfoRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodesInfoRequest.java
@@ -72,7 +72,7 @@ public NodesInfoRequest(StreamInput in) throws IOException {
      * for all nodes will be returned.
      */
     public NodesInfoRequest(String... nodesIds) {
-        super(false, nodesIds);
+        super(nodesIds);
         defaultMetrics();
     }
 
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java
@@ -60,7 +60,7 @@ public class NodesReloadSecureSettingsRequest extends BaseNodesRequest<NodesRelo
     private SecureString secureSettingsPassword;
 
     public NodesReloadSecureSettingsRequest() {
-        super(true, (String[]) null);
+        super((String[]) null);
     }
 
     public NodesReloadSecureSettingsRequest(StreamInput in) throws IOException {
@@ -84,7 +84,7 @@ public NodesReloadSecureSettingsRequest(StreamInput in) throws IOException {
      * nodes.
      */
     public NodesReloadSecureSettingsRequest(String... nodesIds) {
-        super(true, nodesIds);
+        super(nodesIds);
     }
 
     @Nullable
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodesStatsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodesStatsRequest.java
@@ -58,7 +58,7 @@ public class NodesStatsRequest extends BaseNodesRequest<NodesStatsRequest> {
     private final Set<String> requestedMetrics = new HashSet<>();
 
     public NodesStatsRequest() {
-        super(false, (String[]) null);
+        super((String[]) null);
     }
 
     public NodesStatsRequest(StreamInput in) throws IOException {
@@ -74,7 +74,7 @@ public NodesStatsRequest(StreamInput in) throws IOException {
      * for all nodes will be returned.
      */
     public NodesStatsRequest(String... nodesIds) {
-        super(false, nodesIds);
+        super(nodesIds);
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/usage/NodesUsageRequest.java
@@ -61,7 +61,7 @@ public NodesUsageRequest(StreamInput in) throws IOException {
      * passed, usage for all nodes will be returned.
      */
     public NodesUsageRequest(String... nodesIds) {
-        super(false, nodesIds);
+        super(nodesIds);
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java
@@ -161,7 +161,7 @@ public Request(StreamInput in) throws IOException {
         }
 
         public Request(String[] nodesIds) {
-            super(false, nodesIds);
+            super(nodesIds);
         }
 
         public Request snapshots(Snapshot[] snapshots) {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsRequest.java
@@ -83,7 +83,7 @@ public ClusterStatsRequest(StreamInput in) throws IOException {
      * based on all nodes will be returned.
      */
     public ClusterStatsRequest(String... nodesIds) {
-        super(false, nodesIds);
+        super(nodesIds);
     }
 
     public boolean useAggregatedNodeLevelResponses() {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/wlm/WlmStatsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/wlm/WlmStatsRequest.java
@@ -37,13 +37,13 @@ public WlmStatsRequest(StreamInput in) throws IOException {
      * for all nodes will be returned.
      */
     public WlmStatsRequest(String[] nodesIds, Set<String> workloadGroupIds, Boolean breach) {
-        super(false, nodesIds);
+        super(nodesIds);
         this.workloadGroupIds = workloadGroupIds;
         this.breach = breach;
     }
 
     public WlmStatsRequest() {
-        super(false, (String[]) null);
+        super((String[]) null);
         workloadGroupIds = new HashSet<>();
         this.breach = false;
     }
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/dangling/find/FindDanglingIndexRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/dangling/find/FindDanglingIndexRequest.java
@@ -53,7 +53,7 @@ public FindDanglingIndexRequest(StreamInput in) throws IOException {
     }
 
     public FindDanglingIndexRequest(String indexUUID) {
-        super(false, Strings.EMPTY_ARRAY);
+        super(Strings.EMPTY_ARRAY);
         this.indexUUID = indexUUID;
     }
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/dangling/list/ListDanglingIndicesRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/dangling/list/ListDanglingIndicesRequest.java
@@ -58,12 +58,12 @@ public ListDanglingIndicesRequest(StreamInput in) throws IOException {
     }
 
     public ListDanglingIndicesRequest() {
-        super(false, Strings.EMPTY_ARRAY);
+        super(Strings.EMPTY_ARRAY);
         this.indexUUID = null;
     }
 
     public ListDanglingIndicesRequest(String indexUUID) {
-        super(false, Strings.EMPTY_ARRAY);
+        super(Strings.EMPTY_ARRAY);
         this.indexUUID = indexUUID;
     }
 
diff --git a/server/src/main/java/org/opensearch/action/search/GetAllPitNodesRequest.java b/server/src/main/java/org/opensearch/action/search/GetAllPitNodesRequest.java
@@ -27,7 +27,7 @@ public class GetAllPitNodesRequest extends BaseNodesRequest<GetAllPitNodesReques
 
     @Inject
     public GetAllPitNodesRequest(DiscoveryNode... concreteNodes) {
-        super(false, concreteNodes);
+        super(concreteNodes);
     }
 
     public GetAllPitNodesRequest(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/opensearch/action/support/nodes/BaseNodesRequest.java b/server/src/main/java/org/opensearch/action/support/nodes/BaseNodesRequest.java
@@ -63,17 +63,12 @@ public abstract class BaseNodesRequest<Request extends BaseNodesRequest<Request>
     /**
      * once {@link #nodesIds} are resolved this will contain the concrete nodes that are part of this request. If set, {@link #nodesIds}
      * will be ignored and this will be used.
-     * */
+     * <p>
+     * Note: concreteNodes when accessed by transport actions will be null.
+     * See {@link TransportNodesAction.AsyncAction#AsyncAction}
+     **/
     private DiscoveryNode[] concreteNodes;
 
-    /**
-     * Since do not use the discovery nodes coming from the request in all code paths following a request extended off from
-     * BaseNodeRequest, we do not require it to sent around across all nodes.
-     *
-     * Setting default behavior as `true` but can be explicitly changed in requests that do not require.
-     */
-    private boolean includeDiscoveryNodes = true;
-
     private final TimeValue DEFAULT_TIMEOUT_SECS = TimeValue.timeValueSeconds(30);
 
     private TimeValue timeout;
@@ -89,22 +84,11 @@ protected BaseNodesRequest(String... nodesIds) {
         this.nodesIds = nodesIds;
     }
 
-    protected BaseNodesRequest(boolean includeDiscoveryNodes, String... nodesIds) {
-        this.nodesIds = nodesIds;
-        this.includeDiscoveryNodes = includeDiscoveryNodes;
-    }
-
     protected BaseNodesRequest(DiscoveryNode... concreteNodes) {
         this.nodesIds = null;
         this.concreteNodes = concreteNodes;
     }
 
-    protected BaseNodesRequest(boolean includeDiscoveryNodes, DiscoveryNode... concreteNodes) {
-        this.nodesIds = null;
-        this.concreteNodes = concreteNodes;
-        this.includeDiscoveryNodes = includeDiscoveryNodes;
-    }
-
     public final String[] nodesIds() {
         return nodesIds;
     }
@@ -139,10 +123,6 @@ public void setConcreteNodes(DiscoveryNode[] concreteNodes) {
         this.concreteNodes = concreteNodes;
     }
 
-    public boolean getIncludeDiscoveryNodes() {
-        return includeDiscoveryNodes;
-    }
-
     @Override
     public ActionRequestValidationException validate() {
         return null;
diff --git a/server/src/main/java/org/opensearch/action/support/nodes/TransportNodesAction.java b/server/src/main/java/org/opensearch/action/support/nodes/TransportNodesAction.java
@@ -240,12 +240,10 @@ class AsyncAction {
             }
             this.responses = new AtomicReferenceArray<>(request.concreteNodes().length);
             this.concreteNodes = request.concreteNodes();
-            if (request.getIncludeDiscoveryNodes() == false) {
-                // As we transfer the ownership of discovery nodes to route the request to into the AsyncAction class,
-                // we remove the list of DiscoveryNodes from the request. This reduces the payload of the request and improves
-                // the number of concrete nodes in the memory.
-                request.setConcreteNodes(null);
-            }
+            // As we transfer the ownership of discovery nodes to route the request to into the AsyncAction class,
+            // we remove the list of DiscoveryNodes from the request. This reduces the payload of the request and improves
+            // the number of concrete nodes in the memory.
+            request.setConcreteNodes(null);
         }
 
         void start() {
diff --git a/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayMetaState.java b/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayMetaState.java
@@ -133,7 +133,7 @@ public Request(StreamInput in) throws IOException {
         }
 
         public Request(String... nodesIds) {
-            super(false, nodesIds);
+            super(nodesIds);
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java b/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
@@ -197,7 +197,7 @@ public Request(StreamInput in) throws IOException {
         }
 
         public Request(ShardId shardId, String customDataPath, DiscoveryNode[] nodes) {
-            super(false, nodes);
+            super(nodes);
             this.shardId = Objects.requireNonNull(shardId);
             this.customDataPath = Objects.requireNonNull(customDataPath);
         }
diff --git a/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShardsBatch.java b/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShardsBatch.java
@@ -182,7 +182,7 @@ public Request(StreamInput in) throws IOException {
         }
 
         public Request(DiscoveryNode[] nodes, Map<ShardId, ShardAttributes> shardAttributes) {
-            super(false, nodes);
+            super(nodes);
             this.shardAttributes = Objects.requireNonNull(shardAttributes);
         }
 
diff --git a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
@@ -176,7 +176,7 @@ public Request(StreamInput in) throws IOException {
         }
 
         public Request(ShardId shardId, String customDataPath, DiscoveryNode[] nodes) {
-            super(false, nodes);
+            super(nodes);
             this.shardId = Objects.requireNonNull(shardId);
             this.customDataPath = Objects.requireNonNull(customDataPath);
         }
diff --git a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadataBatch.java b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadataBatch.java
@@ -188,7 +188,7 @@ public Request(StreamInput in) throws IOException {
         }
 
         public Request(Map<ShardId, ShardAttributes> shardAttributes, DiscoveryNode[] nodes) {
-            super(false, nodes);
+            super(nodes);
             this.shardAttributes = Objects.requireNonNull(shardAttributes);
         }
 
diff --git a/server/src/test/java/org/opensearch/action/support/nodes/TransportNodesActionTests.java b/server/src/test/java/org/opensearch/action/support/nodes/TransportNodesActionTests.java
@@ -168,25 +168,9 @@ public void testCustomResolving() throws Exception {
         assertEquals(clusterService.state().nodes().getDataNodes().size(), capturedRequests.size());
     }
 
-    public void testTransportNodesActionWithDiscoveryNodesIncluded() {
-        String[] nodeIds = clusterService.state().nodes().getNodes().keySet().toArray(new String[0]);
-        TestNodesRequest request = new TestNodesRequest(true, nodeIds);
-        getTestTransportNodesAction().new AsyncAction(null, request, new PlainActionFuture<>()).start();
-        Map<String, List<CapturingTransport.CapturedRequest>> capturedRequests = transport.getCapturedRequestsByTargetNodeAndClear();
-        List<TestNodeRequest> capturedTransportNodeRequestList = capturedRequests.values()
-            .stream()
-            .flatMap(Collection::stream)
-            .map(capturedRequest -> (TestNodeRequest) capturedRequest.request)
-            .collect(Collectors.toList());
-        assertEquals(nodeIds.length, capturedTransportNodeRequestList.size());
-        capturedTransportNodeRequestList.forEach(
-            capturedRequest -> assertEquals(nodeIds.length, capturedRequest.testNodesRequest.concreteNodes().length)
-        );
-    }
-
     public void testTransportNodesActionWithDiscoveryNodesReset() {
         String[] nodeIds = clusterService.state().nodes().getNodes().keySet().toArray(new String[0]);
-        TestNodesRequest request = new TestNodesRequest(false, nodeIds);
+        TestNodesRequest request = new TestNodesRequest(nodeIds);
         getTestTransportNodesAction().new AsyncAction(null, request, new PlainActionFuture<>()).start();
         Map<String, List<CapturingTransport.CapturedRequest>> capturedRequests = transport.getCapturedRequestsByTargetNodeAndClear();
         List<TestNodeRequest> capturedTransportNodeRequestList = capturedRequests.values()
@@ -389,10 +373,6 @@ private static class TestNodesRequest extends BaseNodesRequest<TestNodesRequest>
         TestNodesRequest(String... nodesIds) {
             super(nodesIds);
         }
-
-        TestNodesRequest(boolean includeDiscoveryNodes, String... nodesIds) {
-            super(includeDiscoveryNodes, nodesIds);
-        }
     }
 
     private static class TestNodesResponse extends BaseNodesResponse<TestNodeResponse> {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public NodesHotThreadsRequest(StreamInput in) throws IOException {`
`70`	`70`	`* threads for all nodes is used.`
`71`	`71`	`*/`
`72`	`72`	`public NodesHotThreadsRequest(String... nodesIds) {`
`73`		`- super(false, nodesIds);`
	`73`	`+ super(nodesIds);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public int threads() {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public NodesInfoRequest(StreamInput in) throws IOException {`
`72`	`72`	`* for all nodes will be returned.`
`73`	`73`	`*/`
`74`	`74`	`public NodesInfoRequest(String... nodesIds) {`
`75`		`- super(false, nodesIds);`
	`75`	`+ super(nodesIds);`
`76`	`76`	`defaultMetrics();`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public class NodesReloadSecureSettingsRequest extends BaseNodesRequest<NodesRelo`
`60`	`60`	`private SecureString secureSettingsPassword;`
`61`	`61`
`62`	`62`	`public NodesReloadSecureSettingsRequest() {`
`63`		`- super(true, (String[]) null);`
	`63`	`+ super((String[]) null);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public NodesReloadSecureSettingsRequest(StreamInput in) throws IOException {`
`@@ -84,7 +84,7 @@ public NodesReloadSecureSettingsRequest(StreamInput in) throws IOException {`
`84`	`84`	`* nodes.`
`85`	`85`	`*/`
`86`	`86`	`public NodesReloadSecureSettingsRequest(String... nodesIds) {`
`87`		`- super(true, nodesIds);`
	`87`	`+ super(nodesIds);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`@Nullable`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public class NodesStatsRequest extends BaseNodesRequest<NodesStatsRequest> {`
`58`	`58`	`private final Set<String> requestedMetrics = new HashSet<>();`
`59`	`59`
`60`	`60`	`public NodesStatsRequest() {`
`61`		`- super(false, (String[]) null);`
	`61`	`+ super((String[]) null);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public NodesStatsRequest(StreamInput in) throws IOException {`
`@@ -74,7 +74,7 @@ public NodesStatsRequest(StreamInput in) throws IOException {`
`74`	`74`	`* for all nodes will be returned.`
`75`	`75`	`*/`
`76`	`76`	`public NodesStatsRequest(String... nodesIds) {`
`77`		`- super(false, nodesIds);`
	`77`	`+ super(nodesIds);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public NodesUsageRequest(StreamInput in) throws IOException {`
`61`	`61`	`* passed, usage for all nodes will be returned.`
`62`	`62`	`*/`
`63`	`63`	`public NodesUsageRequest(String... nodesIds) {`
`64`		`- super(false, nodesIds);`
	`64`	`+ super(nodesIds);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public Request(StreamInput in) throws IOException {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`public Request(String[] nodesIds) {`
`164`		`- super(false, nodesIds);`
	`164`	`+ super(nodesIds);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`public Request snapshots(Snapshot[] snapshots) {`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public ClusterStatsRequest(StreamInput in) throws IOException {`
`83`	`83`	`* based on all nodes will be returned.`
`84`	`84`	`*/`
`85`	`85`	`public ClusterStatsRequest(String... nodesIds) {`
`86`		`- super(false, nodesIds);`
	`86`	`+ super(nodesIds);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`public boolean useAggregatedNodeLevelResponses() {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public FindDanglingIndexRequest(StreamInput in) throws IOException {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public FindDanglingIndexRequest(String indexUUID) {`
`56`		`- super(false, Strings.EMPTY_ARRAY);`
	`56`	`+ super(Strings.EMPTY_ARRAY);`
`57`	`57`	`this.indexUUID = indexUUID;`
`58`	`58`	`}`
`59`	`59`