Replace master with cluster_manager in assertNoMaster() in server/src…

…/test Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-project · May 18, 2022 · dbb085b · dbb085b
1 parent 47cfbab
commit dbb085b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/server/src/internalClusterTest/java/org/opensearch/discovery/ClusterDisruptionIT.java b/server/src/internalClusterTest/java/org/opensearch/discovery/ClusterDisruptionIT.java
@@ -386,7 +386,7 @@ public void onFailure(Exception e) {
         );
 
         if (isolatedNode.equals(nonClusterManagerNode)) {
-            assertNoMaster(nonClusterManagerNode);
+            assertNoClusterManager(nonClusterManagerNode);
         } else {
             ensureStableCluster(2, nonClusterManagerNode);
         }

diff --git a/server/src/internalClusterTest/java/org/opensearch/discovery/DiscoveryDisruptionIT.java b/server/src/internalClusterTest/java/org/opensearch/discovery/DiscoveryDisruptionIT.java
@@ -81,7 +81,7 @@ public void testClusterJoinDespiteOfPublishingIssues() throws Exception {
         );
         nonMasterTransportService.addFailToSendNoConnectRule(masterTranspotService);
 
-        assertNoMaster(nonClusterManagerNode);
+        assertNoClusterManager(nonClusterManagerNode);
 
         logger.info("blocking cluster state publishing from master [{}] to non master [{}]", clusterManagerNode, nonClusterManagerNode);
         MockTransportService masterTransportService = (MockTransportService) internalCluster().getInstance(
@@ -153,7 +153,7 @@ public void testElectMasterWithLatestVersion() throws Exception {
         logger.info("--> forcing a complete election to make sure \"preferred\" master is elected");
         isolateAllNodes.startDisrupting();
         for (String node : nodes) {
-            assertNoMaster(node);
+            assertNoClusterManager(node);
         }
         internalCluster().clearDisruptionScheme();
         ensureStableCluster(3);
@@ -181,7 +181,7 @@ public void testElectMasterWithLatestVersion() throws Exception {
         logger.info("--> forcing a complete election again");
         isolateAllNodes.startDisrupting();
         for (String node : nodes) {
-            assertNoMaster(node);
+            assertNoClusterManager(node);
         }
 
         isolateAllNodes.stopDisrupting();
@@ -225,7 +225,7 @@ public void testNodeNotReachableFromMaster() throws Exception {
         ensureStableCluster(2, clusterManagerNode);
 
         logger.info("waiting for [{}] to have no cluster-manager", nonClusterManagerNode);
-        assertNoMaster(nonClusterManagerNode);
+        assertNoClusterManager(nonClusterManagerNode);
 
         logger.info("healing partition and checking cluster reforms");
         masterTransportService.clearAllRules();

diff --git a/server/src/internalClusterTest/java/org/opensearch/discovery/MasterDisruptionIT.java b/server/src/internalClusterTest/java/org/opensearch/discovery/MasterDisruptionIT.java
@@ -135,7 +135,7 @@ public void testIsolateMasterAndVerifyClusterStateConsensus() throws Exception {
         ensureStableCluster(2, nonIsolatedNode);
 
         // make sure isolated need picks up on things.
-        assertNoMaster(isolatedNode, TimeValue.timeValueSeconds(40));
+        assertNoClusterManager(isolatedNode, TimeValue.timeValueSeconds(40));
 
         // restore isolation
         networkDisruption.stopDisrupting();
@@ -225,7 +225,7 @@ public void testVerifyApiBlocksDuringPartition() throws Exception {
         // continuously ping until network failures have been resolved. However
         // It may a take a bit before the node detects it has been cut off from the elected master
         logger.info("waiting for isolated node [{}] to have no cluster-manager", isolatedNode);
-        assertNoMaster(isolatedNode, NoMasterBlockService.NO_MASTER_BLOCK_WRITES, TimeValue.timeValueSeconds(30));
+        assertNoClusterManager(isolatedNode, NoMasterBlockService.NO_MASTER_BLOCK_WRITES, TimeValue.timeValueSeconds(30));
 
         logger.info("wait until elected master has been removed and a new 2 node cluster was from (via [{}])", isolatedNode);
         ensureStableCluster(2, nonIsolatedNode);
@@ -271,7 +271,7 @@ public void testVerifyApiBlocksDuringPartition() throws Exception {
         // continuously ping until network failures have been resolved. However
         // It may a take a bit before the node detects it has been cut off from the elected master
         logger.info("waiting for isolated node [{}] to have no cluster-manager", isolatedNode);
-        assertNoMaster(isolatedNode, NoMasterBlockService.NO_MASTER_BLOCK_ALL, TimeValue.timeValueSeconds(30));
+        assertNoClusterManager(isolatedNode, NoMasterBlockService.NO_MASTER_BLOCK_ALL, TimeValue.timeValueSeconds(30));
 
         // make sure we have stable cluster & cross partition recoveries are canceled by the removal of the missing node
         // the unresponsive partition causes recoveries to only time out after 15m (default) and these will cause

diff --git a/server/src/test/java/org/opensearch/discovery/AbstractDisruptionTestCase.java b/server/src/test/java/org/opensearch/discovery/AbstractDisruptionTestCase.java
@@ -155,15 +155,15 @@ ClusterState getNodeClusterState(String node) {
         return client(node).admin().cluster().prepareState().setLocal(true).get().getState();
     }
 
-    void assertNoMaster(final String node) throws Exception {
-        assertNoMaster(node, null, TimeValue.timeValueSeconds(30));
+    void assertNoClusterManager(final String node) throws Exception {
+        assertNoClusterManager(node, null, TimeValue.timeValueSeconds(30));
     }
 
-    void assertNoMaster(final String node, TimeValue maxWaitTime) throws Exception {
-        assertNoMaster(node, null, maxWaitTime);
+    void assertNoClusterManager(final String node, TimeValue maxWaitTime) throws Exception {
+        assertNoClusterManager(node, null, maxWaitTime);
     }
 
-    void assertNoMaster(final String node, @Nullable final ClusterBlock expectedBlocks, TimeValue maxWaitTime) throws Exception {
+    void assertNoClusterManager(final String node, @Nullable final ClusterBlock expectedBlocks, TimeValue maxWaitTime) throws Exception {
         assertBusy(() -> {
             ClusterState state = getNodeClusterState(node);
             final DiscoveryNodes nodes = state.nodes();