Changed master nomenclature to cluster_manager(2) (opensearch-project…

…#175) Signed-off-by: Dhrubajyoti Das <[email protected]> Signed-off-by: Dhrubajyoti Das <[email protected]> Co-authored-by: Dhrubajyoti Das <[email protected]> Signed-off-by: Arpit Bandejiya <[email protected]>
Arpit-Bandejiya · Nov 2, 2022 · 7a0fc05 · 7a0fc05
1 parent 4f1f992
commit 7a0fc05
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...va/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementService.java b/...va/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementService.java
@@ -128,14 +128,14 @@ private void performPersistedResponseCleanUpAction(AsynchronousSearchCleanUpRequ
 
     @Override
     public void clusterChanged(ClusterChangedEvent event) {
-        if (event.localNodeMaster() && persistedResponseCleanUpRunnable.get() == null) {
+        if (event.localNodeClusterManager() && persistedResponseCleanUpRunnable.get() == null) {
             logger.trace("elected as cluster_manager, triggering response cleanup tasks");
             triggerCleanUp(event.state(), "became cluster_manager");
 
             final PersistedResponseCleanUpAndRescheduleRunnable newRunnable = new PersistedResponseCleanUpAndRescheduleRunnable();
             persistedResponseCleanUpRunnable.set(newRunnable);
             threadPool.scheduleUnlessShuttingDown(persistedResponseCleanUpInterval, RESPONSE_CLEANUP_SCHEDULING_EXECUTOR, newRunnable);
-        } else if (event.localNodeMaster() == false) {
+        } else if (event.localNodeClusterManager() == false) {
             persistedResponseCleanUpRunnable.set(null);
             return;
         }

diff --git a/...g/opensearch/search/asynchronous/management/AsynchronousSearchManagementServiceTests.java b/...g/opensearch/search/asynchronous/management/AsynchronousSearchManagementServiceTests.java
@@ -219,17 +219,17 @@ private static DiscoveryNodes createDiscoveryNodes(final int numNodes, final boo
             if (i == 0) {
                 //local node id
                 builder.localNodeId(nodeId);
-                roles.add(DiscoveryNodeRole.MASTER_ROLE);
+                roles.add(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE);
             } else if (i == 1) {
                 // the alternate cluster_manager node
-                roles.add(DiscoveryNodeRole.MASTER_ROLE);
+                roles.add(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE);
             } else if (i == 2) {
                 // we need at least one data node
                 roles.add(DiscoveryNodeRole.DATA_ROLE);
             } else {
                 // remaining nodes can be anything (except for cluster_manager)
                 if (randomBoolean()) {
-                    roles.add(DiscoveryNodeRole.MASTER_ROLE);
+                    roles.add(DiscoveryNodeRole.CLUSTER_MANAGER_ROLE);
                 }
                 if (randomBoolean()) {
                     roles.add(DiscoveryNodeRole.DATA_ROLE);
@@ -238,7 +238,7 @@ private static DiscoveryNodes createDiscoveryNodes(final int numNodes, final boo
             final DiscoveryNode node = newNode(nodeId, roles);
             builder.add(node);
             if (i == clusterManagerNodeIndex) {
-                builder.masterNodeId(nodeId);
+                builder.clusterManagerNodeId(nodeId);
             }
         }
         return builder.build();

diff --git a/src/test/java/org/opensearch/search/asynchronous/utils/TestUtils.java b/src/test/java/org/opensearch/search/asynchronous/utils/TestUtils.java
@@ -37,12 +37,12 @@ public static ClusterService createClusterService(Settings settings, ThreadPool
                 .nodes(DiscoveryNodes.builder()
                         .add(localNode)
                         .localNodeId(localNode.getId())
-                        .masterNodeId(localNode.getId()))
+                        .clusterManagerNodeId(localNode.getId()))
                 .blocks(ClusterBlocks.EMPTY_CLUSTER_BLOCK).build();
         clusterService.getClusterApplierService().setInitialState(initialClusterState);
-        clusterService.getMasterService().setClusterStatePublisher(
+        clusterService.getClusterManagerService().setClusterStatePublisher(
                 createClusterStatePublisher(clusterService.getClusterApplierService()));
-        clusterService.getMasterService().setClusterStateSupplier(clusterService.getClusterApplierService()::state);
+        clusterService.getClusterManagerService().setClusterStateSupplier(clusterService.getClusterApplierService()::state);
         clusterService.start();
         return clusterService;
     }