Rename master to cluster-manager in sever/src/test

Signed-off-by: Tianli Feng <ftianli@amazon.com>

server/src/test/java/org/opensearch/action/admin/cluster/reroute/ClusterRerouteRequestTests.java

@@ -161,7 +161,7 @@ public void testEqualsAndHashCode() {
             assertEquals(request, copy);
             assertEquals(request.hashCode(), copy.hashCode());
 
-            // Changing clusterManagerNodeTime makes requests not equal
+            // Changing clusterManagerNodeTimeout makes requests not equal
             copy.masterNodeTimeout(timeValueMillis(request.masterNodeTimeout().millis() + 1));
             assertNotEquals(request, copy);
             assertNotEquals(request.hashCode(), copy.hashCode());

server/src/test/java/org/opensearch/action/support/master/TransportMasterNodeActionTests.java

@@ -533,8 +533,8 @@ protected void masterOperation(Request request, ClusterState state, ActionListen
         assertThat(listener.get(), equalTo(response));
     }
 
-    // Validate TransportMasterNodeAction.testDelegateToMaster() works correctly on node with the deprecated MASTER_ROLE.
-    public void testDelegateToMasterOnNodeWithDeprecatedMasterRole() throws ExecutionException, InterruptedException {
+    // Validate TransportMasterNodeAction.testDelegateToClusterManager() works correctly on node with the deprecated MASTER_ROLE.
+    public void testDelegateToClusterManagerOnNodeWithDeprecatedMasterRole() throws ExecutionException, InterruptedException {
         DiscoveryNode localNode = new DiscoveryNode(
             "local_node",
             buildNewFakeTransportAddress(),

server/src/test/java/org/opensearch/action/support/master/TransportMasterNodeActionUtils.java

@@ -42,7 +42,7 @@ public class TransportMasterNodeActionUtils {
      * Allows to directly call {@link TransportMasterNodeAction#masterOperation(MasterNodeRequest, ClusterState, ActionListener)} which is
      * a protected method.
      */
-    public static <Request extends MasterNodeRequest<Request>, Response extends ActionResponse> void runMasterOperation(
+    public static <Request extends MasterNodeRequest<Request>, Response extends ActionResponse> void runClusterManagerOperation(
         TransportMasterNodeAction<Request, Response> clusterManagerNodeAction,
         Request request,
         ClusterState clusterState,

server/src/test/java/org/opensearch/cluster/ClusterChangedEventTests.java

@@ -314,8 +314,8 @@ public void testChangedCustomMetadataSet() {
         assertTrue(changedCustomMetadataTypeSet.contains(customMetadata1.getWriteableName()));
     }
 
-    // Validate the above test case testLocalNodeIsMaster() passes when the deprecated 'master' role is assigned to the local node.
-    public void testLocalNodeIsMasterWithDeprecatedMasterRole() {
+    // Validate the above test case testLocalNodeIsClusterManager() passes when the deprecated 'master' role is assigned to the local node.
+    public void testLocalNodeIsClusterManagerWithDeprecatedMasterRole() {
         final DiscoveryNodes.Builder builderLocalIsMaster = DiscoveryNodes.builder();
         final DiscoveryNode node0 = newNode("node_0", Set.of(DiscoveryNodeRole.MASTER_ROLE));
         final DiscoveryNode node1 = newNode("node_1", Set.of(DiscoveryNodeRole.DATA_ROLE));

server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java

@@ -470,7 +470,12 @@ private <Request extends MasterNodeRequest<Request>, Response extends ActionResp
     ) {
         return executeClusterStateUpdateTask(clusterState, () -> {
             try {
-                TransportMasterNodeActionUtils.runMasterOperation(masterNodeAction, request, clusterState, new PlainActionFuture<>());
+                TransportMasterNodeActionUtils.runClusterManagerOperation(
+                    masterNodeAction,
+                    request,
+                    clusterState,
+                    new PlainActionFuture<>()
+                );
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }