Replace master with cluster_manager in server/src/internalClusterTest

Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-project · May 18, 2022 · 2176adf · 2176adf
1 parent 22d2c3e
commit 2176adf
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...ernalClusterTest/java/org/opensearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java b/...ernalClusterTest/java/org/opensearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java
@@ -91,7 +91,7 @@ public void testPendingTasksWithClusterNotRecoveredBlock() throws Exception {
         }
 
         // restart the cluster but prevent it from performing state recovery
-        final int nodeCount = client().admin().cluster().prepareNodesInfo("data:true", "master:true").get().getNodes().size();
+        final int nodeCount = client().admin().cluster().prepareNodesInfo("data:true", "cluster_manager:true").get().getNodes().size();
         internalCluster().fullRestart(new InternalTestCluster.RestartCallback() {
             @Override
             public Settings onNodeStopped(String nodeName) {

diff --git a/...port/master/IndexingMasterFailoverIT.java → ...ter/IndexingClusterManagerFailoverIT.java b/...port/master/IndexingMasterFailoverIT.java → ...ter/IndexingClusterManagerFailoverIT.java
@@ -48,7 +48,7 @@
 import static org.hamcrest.Matchers.equalTo;
 
 @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, autoManageMasterNodes = false)
-public class IndexingMasterFailoverIT extends OpenSearchIntegTestCase {
+public class IndexingClusterManagerFailoverIT extends OpenSearchIntegTestCase {
 
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {

diff --git a/...rg/opensearch/cluster/NoMasterNodeIT.java → ...earch/cluster/NoClusterManagerNodeIT.java b/...rg/opensearch/cluster/NoMasterNodeIT.java → ...earch/cluster/NoClusterManagerNodeIT.java
@@ -75,7 +75,7 @@
 import static org.hamcrest.Matchers.greaterThan;
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class NoMasterNodeIT extends OpenSearchIntegTestCase {
+public class NoClusterManagerNodeIT extends OpenSearchIntegTestCase {
 
     @Override
     protected int numberOfReplicas() {

diff --git a/...nsearch/discovery/MasterDisruptionIT.java → ...discovery/ClusterManagerDisruptionIT.java b/...nsearch/discovery/MasterDisruptionIT.java → ...discovery/ClusterManagerDisruptionIT.java
@@ -63,7 +63,7 @@
  * Tests relating to the loss of the cluster-manager.
  */
 @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0)
-public class MasterDisruptionIT extends AbstractDisruptionTestCase {
+public class ClusterManagerDisruptionIT extends AbstractDisruptionTestCase {
 
     /**
      * Test that cluster recovers from a long GC on cluster-manager that causes other nodes to elect a new one

diff --git a/...ing/DedicatedMasterGetFieldMappingIT.java → ...catedClusterManagerGetFieldMappingIT.java b/...ing/DedicatedMasterGetFieldMappingIT.java → ...catedClusterManagerGetFieldMappingIT.java
@@ -38,7 +38,7 @@
 import static org.opensearch.test.OpenSearchIntegTestCase.Scope;
 
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class DedicatedMasterGetFieldMappingIT extends SimpleGetFieldMappingsIT {
+public class DedicatedClusterManagerGetFieldMappingIT extends SimpleGetFieldMappingsIT {
 
     @Before
     public void before1() throws Exception {

diff --git a/...src/internalClusterTest/java/org/opensearch/snapshots/RepositoryFilterUserMetadataIT.java b/...src/internalClusterTest/java/org/opensearch/snapshots/RepositoryFilterUserMetadataIT.java
@@ -101,7 +101,7 @@ public static final class MetadataFilteringPlugin extends org.opensearch.plugins
 
         private static final String MOCK_FILTERED_META = "mock_filtered_meta";
 
-        private static final String CLUSTER_MANAGER_SETTING_VALUE = "initial_master";
+        private static final String CLUSTER_MANAGER_SETTING_VALUE = "initial_cluster_manager";
 
         private static final String TYPE = "mock_meta_filtering";