Replace master in subprojects - client modules plugins qa

Signed-off-by: Tianli Feng <[email protected]>
opensearch-project · tlfeng · Feb 15, 2022 · Feb 15, 2022 · Feb 15, 2022 · Feb 15, 2022
commit 998e88d27f4fd98178db51404a4413ad69431b6b
@@ -210,7 +210,7 @@ public Roles(final Set<String> roles) {
         }
 
         /**
-         * Teturns whether or not the node <strong>could</strong> be elected master.
+         * Teturns whether or not the node <strong>could</strong> be elected clustermanager.
          */
         public boolean isMasterEligible() {
             return roles.contains("master");

@@ -36,7 +36,7 @@
 
 /**
  * Selects nodes that can receive requests. Used to keep requests away
- * from master nodes or to send them to nodes with a particular attribute.
+ * from clustermanager nodes or to send them to nodes with a particular attribute.
  * Use with {@link RestClientBuilder#setNodeSelector(NodeSelector)}.
  */
 public interface NodeSelector {

@@ -55,32 +55,32 @@ public void testAny() {
         assertEquals(expected, nodes);
     }
 
-    public void testNotMasterOnly() {
-        Node masterOnly = dummyNode(true, false, false);
+    public void testNotClusterManagerOnly() {
+        Node clusterManagerOnly = dummyNode(true, false, false);
         Node all = dummyNode(true, true, true);
-        Node masterAndData = dummyNode(true, true, false);
-        Node masterAndIngest = dummyNode(true, false, true);
+        Node clusterManagerAndData = dummyNode(true, true, false);
+        Node clusterManagerAndIngest = dummyNode(true, false, true);
         Node coordinatingOnly = dummyNode(false, false, false);
         Node ingestOnly = dummyNode(false, false, true);
         Node data = dummyNode(false, true, randomBoolean());
         List<Node> nodes = new ArrayList<>();
-        nodes.add(masterOnly);
+        nodes.add(clusterManagerOnly);
         nodes.add(all);
-        nodes.add(masterAndData);
-        nodes.add(masterAndIngest);
+        nodes.add(clusterManagerAndData);
+        nodes.add(clusterManagerAndIngest);
         nodes.add(coordinatingOnly);
         nodes.add(ingestOnly);
         nodes.add(data);
         Collections.shuffle(nodes, getRandom());
         List<Node> expected = new ArrayList<>(nodes);
-        expected.remove(masterOnly);
+        expected.remove(clusterManagerOnly);
         NodeSelector.SKIP_DEDICATED_MASTERS.select(nodes);
         assertEquals(expected, nodes);
     }
 
-    private static Node dummyNode(boolean master, boolean data, boolean ingest) {
+    private static Node dummyNode(boolean clusterManager, boolean data, boolean ingest) {
         final Set<String> roles = new TreeSet<>();
-        if (master) {
+        if (clusterManager) {
             roles.add("master");
         }
         if (data) {

@@ -268,9 +268,9 @@ private static Node readNode(String nodeId, JsonParser parser, Scheme scheme) th
              * attributes.
              */
             boolean clientAttribute = v2RoleAttributeValue(realAttributes, "client", false);
-            Boolean masterAttribute = v2RoleAttributeValue(realAttributes, "master", null);
+            Boolean clusterManagerAttribute = v2RoleAttributeValue(realAttributes, "master", null);
             Boolean dataAttribute = v2RoleAttributeValue(realAttributes, "data", null);
-            if ((masterAttribute == null && false == clientAttribute) || masterAttribute) {
+            if ((clusterManagerAttribute == null && false == clientAttribute) || clusterManagerAttribute) {
                 roles.add("master");
             }
             if ((dataAttribute == null && false == clientAttribute) || dataAttribute) {

@@ -5,7 +5,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -7,7 +7,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -118,18 +118,18 @@ public void testReindex() throws Exception {
     public void testReindexFromRemote() throws Exception {
         Function<Client, AbstractBulkByScrollRequestBuilder<?, ?>> function = client -> {
             /*
-             * Use the master node for the reindex from remote because that node
+             * Use the clustermanager node for the reindex from remote because that node
              * doesn't have a copy of the data on it.
              */
-            NodeInfo masterNode = null;
+            NodeInfo clusterManagerNode = null;
             for (NodeInfo candidate : client.admin().cluster().prepareNodesInfo().get().getNodes()) {
                 if (candidate.getNode().isMasterNode()) {
-                    masterNode = candidate;
+                    clusterManagerNode = candidate;
                 }
             }
-            assertNotNull(masterNode);
+            assertNotNull(clusterManagerNode);
 
-            TransportAddress address = masterNode.getInfo(HttpInfo.class).getAddress().publishAddress();
+            TransportAddress address = clusterManagerNode.getInfo(HttpInfo.class).getAddress().publishAddress();
             RemoteInfo remote = new RemoteInfo(
                 "http",
                 address.getAddress(),
@@ -262,8 +262,8 @@ private CyclicBarrier blockExecutor(String name, String node) throws Exception {
      */
     private BulkByScrollTask.Status taskStatus(String action) {
         /*
-         * We always use the master client because we always start the test requests on the
-         * master. We do this simply to make sure that the test request is not started on the
+         * We always use the clustermanager client because we always start the test requests on the
+         * clustermanager. We do this simply to make sure that the test request is not started on the
          * node who's queue we're manipulating.
          */
         ListTasksResponse response = client().admin().cluster().prepareListTasks().setActions(action).setDetailed(true).get();

@@ -118,7 +118,7 @@
         routing: foo
         refresh: true
 
-  # Fetch the http host. We use the host of the master because we know there will always be a master.
+  # Fetch the http host. We use the host of the clustermanager because we know there will always be a clustermanager.
   - do:
       cluster.state: {}
   - set: { master_node: master }
@@ -169,7 +169,7 @@
         body:    { "text": "test" }
         refresh: true
 
-  # Fetch the http host. We use the host of the master because we know there will always be a master.
+  # Fetch the http host. We use the host of the clustermanager because we know there will always be a clustermanager.
   - do:
       cluster.state: {}
   - set: { master_node: master }
@@ -236,7 +236,7 @@
         body:    { "text": "test" }
         refresh: true
 
-  # Fetch the http host. We use the host of the master because we know there will always be a master.
+  # Fetch the http host. We use the host of the clustermanager because we know there will always be a clustermanager.
   - do:
       cluster.state: {}
   - set: { master_node: master }
@@ -302,7 +302,7 @@
         body:    { "text": "test" }
         refresh: true
 
-  # Fetch the http host. We use the host of the master because we know there will always be a master.
+  # Fetch the http host. We use the host of the clustermanager because we know there will always be a clustermanager.
   - do:
       cluster.state: {}
   - set: { master_node: master }
@@ -358,7 +358,7 @@
         body:    { "text": "test" }
         refresh: true
 
-  # Fetch the http host. We use the host of the master because we know there will always be a master.
+  # Fetch the http host. We use the host of the clustermanager because we know there will always be a clustermanager.
   - do:
       cluster.state: {}
   - set: { master_node: master }
@@ -411,7 +411,7 @@
         body:    { "text": "test", "filtered": "removed" }
         refresh: true
 
-  # Fetch the http host. We use the host of the master because we know there will always be a master.
+  # Fetch the http host. We use the host of the clustermanager because we know there will always be a clustermanager.
   - do:
       cluster.state: {}
   - set: { master_node: master }
@@ -480,7 +480,7 @@
       indices.refresh: {}
 
 
-  # Fetch the http host. We use the host of the master because we know there will always be a master.
+  # Fetch the http host. We use the host of the clustermanager because we know there will always be a clustermanager.
   - do:
       cluster.state: {}
   - set: { master_node: master }

@@ -88,7 +88,7 @@ setup:
 
 ---
 "Reindex from remote with parent join field":
-  # Fetch the http host. We use the host of the master because we know there will always be a master.
+  # Fetch the http host. We use the host of the clustermanager because we know there will always be a clustermanager.
   - do:
       cluster.state: {}
   - set: { master_node: master }

@@ -102,7 +102,7 @@ teardown:
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -48,7 +48,7 @@
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0)
 public class Ec2DiscoveryUpdateSettingsTests extends AbstractAwsTestCase {
-    public void testMinimumMasterNodesStart() {
+    public void testMinimumClusterManagerNodesStart() {
         Settings nodeSettings = Settings.builder().put(DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING.getKey(), "ec2").build();
         internalCluster().startNode(nodeSettings);
 

@@ -7,7 +7,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -7,7 +7,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -5,7 +5,7 @@
         reason: "contains is a newly added assertion"
         features: contains
 
-    # Get master node id
+    # Get clustermanager node id
     - do:
         cluster.state: {}
     - set: { master_node: master }

@@ -7,7 +7,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -7,7 +7,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -7,7 +7,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -9,7 +9,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -9,7 +9,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -7,7 +7,7 @@
     - do:
         cluster.state: {}
 
-    # Get master node id
+    # Get clustermanager node id
     - set: { master_node: master }
 
     - do:

@@ -438,17 +438,17 @@ private Nodes buildNodeAndVersions() throws IOException {
 
     final class Nodes extends HashMap<String, Node> {
 
-        private String masterNodeId = null;
+        private String clusterManagerNodeId = null;
 
         public Node getMaster() {
-            return get(masterNodeId);
+            return get(clusterManagerNodeId);
         }
 
         public void setMasterNodeId(String id) {
             if (get(id) == null) {
                 throw new IllegalArgumentException("node with id [" + id + "] not found. got:" + toString());
             }
-            masterNodeId = id;
+            clusterManagerNodeId = id;
         }
 
         public void add(Node node) {
@@ -483,7 +483,7 @@ public Node getSafe(String id) {
         @Override
         public String toString() {
             return "Nodes{" +
-                "masterNodeId='" + masterNodeId + "'\n" +
+                "masterNodeId='" + clusterManagerNodeId + "'\n" +
                 values().stream().map(Node::toString).collect(Collectors.joining("\n")) +
                 '}';
         }