TransportClusterState - Changed the assert expectation to include for…

… case where the local node has the latest cluster-state
opensearch-project · Mar 11, 2024 · 75c82c9 · 75c82c9
1 parent aff33ff
commit 75c82c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.../src/main/java/org/opensearch/action/admin/cluster/state/TransportClusterStateAction.java b/.../src/main/java/org/opensearch/action/admin/cluster/state/TransportClusterStateAction.java
@@ -125,9 +125,12 @@ protected void clusterManagerOperation(
             ? clusterState -> true
             : clusterState -> clusterState.metadata().version() >= request.waitForMetadataVersion();
 
+        // action will be executed on local node, if either the request is local only (or) the local node has the same cluster-state as
+        // ClusterManager
         final Predicate<ClusterState> acceptableClusterStateOrNotMasterPredicate = request.local()
-            ? acceptableClusterStatePredicate
-            : acceptableClusterStatePredicate.or(clusterState -> clusterState.nodes().isLocalNodeElectedClusterManager() == false);
+            || !state.nodes().isLocalNodeElectedClusterManager()
+                ? acceptableClusterStatePredicate
+                : acceptableClusterStatePredicate.or(clusterState -> clusterState.nodes().isLocalNodeElectedClusterManager() == false);
 
         if (acceptableClusterStatePredicate.test(state)) {
             ActionListener.completeWith(listener, () -> buildResponse(request, state));

diff --git a/...a/org/opensearch/action/support/clustermanager/TransportClusterManagerTermCheckTests.java b/...a/org/opensearch/action/support/clustermanager/TransportClusterManagerTermCheckTests.java
@@ -250,15 +250,15 @@ public void testTermCheckNoMatchWithClusterManager() throws ExecutionException,
         CapturingTransport.CapturedRequest termCheckRequest = transport.capturedRequests()[0];
         assertTrue(termCheckRequest.node.isClusterManagerNode());
         assertThat(termCheckRequest.action, equalTo("cluster:monitor/term"));
-        GetTermVersionResponse termVersionResponse = new GetTermVersionResponse(
+        GetTermVersionResponse noMatchResponse = new GetTermVersionResponse(
             new ClusterStateTermVersion(
                 clusterService.state().getClusterName(),
-                clusterService.state().stateUUID(),
+                clusterService.state().metadata().clusterUUID(),
                 clusterService.state().term(),
                 clusterService.state().version() - 1
             )
         );
-        transport.handleResponse(termCheckRequest.requestId, termVersionResponse);
+        transport.handleResponse(termCheckRequest.requestId, noMatchResponse);
         assertFalse(listener.isDone());
 
         assertThat(transport.capturedRequests().length, equalTo(2));