Fix Flaky Test SpecificClusterManagerNodesIT.testElectOnlyBetweenClus…

…terManagerNodes Signed-off-by: kkewwei <[email protected]>
opensearch-project · Sep 21, 2024 · 4d812e9 · 4d812e9
1 parent 036f6bc
commit 4d812e9
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/...er/src/internalClusterTest/java/org/opensearch/cluster/SpecificClusterManagerNodesIT.java b/...er/src/internalClusterTest/java/org/opensearch/cluster/SpecificClusterManagerNodesIT.java
@@ -44,6 +44,7 @@
 import org.opensearch.test.OpenSearchIntegTestCase.Scope;
 
 import java.io.IOException;
+import java.util.function.Supplier;
 
 import static org.opensearch.test.NodeRoles.clusterManagerNode;
 import static org.opensearch.test.NodeRoles.dataOnlyNode;
@@ -255,19 +256,24 @@ public void testElectOnlyBetweenClusterManagerNodes() throws Exception {
         client().execute(AddVotingConfigExclusionsAction.INSTANCE, new AddVotingConfigExclusionsRequest(clusterManagerNodeName)).get();
         // removing the cluster-manager from the voting configuration immediately triggers the cluster-manager to step down
         assertBusy(() -> {
-            assertThat(
-                internalCluster().nonClusterManagerClient()
-                    .admin()
-                    .cluster()
-                    .prepareState()
-                    .execute()
-                    .actionGet()
-                    .getState()
-                    .nodes()
-                    .getClusterManagerNode()
-                    .getName(),
-                equalTo(nextClusterManagerEligableNodeName)
-            );
+            Supplier<String> clusterManagerName = () -> {
+                try {
+                    return internalCluster().nonClusterManagerClient()
+                        .admin()
+                        .cluster()
+                        .prepareState()
+                        .execute()
+                        .actionGet()
+                        .getState()
+                        .nodes()
+                        .getClusterManagerNode()
+                        .getName();
+                } catch (Exception e) {
+                    logger.debug("failed to get cluster-manager name", e);
+                    return null;
+                }
+            };
+            assertThat(clusterManagerName.get(), equalTo(nextClusterManagerEligableNodeName));
             assertThat(
                 internalCluster().clusterManagerClient()
                     .admin()