Replace 'master' terminology with 'cluster manager' in 'plugins' directory (#3329)

* Replace 'master' terminology with 'cluster manager' in 'plugins' directory Signed-off-by: Tianli Feng <ftianli@amazon.com> * Replace master_node with cluster_manager_node in cluster.state API test Signed-off-by: Tianli Feng <ftianli@amazon.com>
2022-05-16 05:46:39 -07:00 · 2022-05-16 05:46:39 -07:00 · 8460bcf2ec
parent 5a02949bbe
commit 8460bcf2ec
17 changed files with 50 additions and 50 deletions
--- a/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml
+++ b/plugins/discovery-azure-classic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: discovery-azure-classic } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: discovery-azure-classic } }
--- a/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java
+++ b/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java
@ -48,7 +48,7 @@ import static org.hamcrest.CoreMatchers.is;
 */
@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);

--- a/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml
+++ b/plugins/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: discovery-ec2 } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: discovery-ec2 } }
--- a/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java
+++ b/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java
@ -85,11 +85,11 @@ public class GceDiscoverTests extends OpenSearchIntegTestCase {
    }

    public void testJoin() {
-        // start master node
-        final String masterNode = internalCluster().startClusterManagerOnlyNode();
-        registerGceNode(masterNode);
+        // start cluster-manager node
+        final String clusterManagerNode = internalCluster().startClusterManagerOnlyNode();
+        registerGceNode(clusterManagerNode);

-        ClusterStateResponse clusterStateResponse = client(masterNode).admin()
+        ClusterStateResponse clusterStateResponse = client(clusterManagerNode).admin()
            .cluster()
            .prepareState()
            .setMasterNodeTimeout("1s")
--- a/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml
+++ b/plugins/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: discovery-gce } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: discovery-gce } }
--- a/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml
+++ b/plugins/examples/custom-significance-heuristic/src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml
@ -5,12 +5,12 @@
        reason: "contains is a newly added assertion"
        features: contains

-    # Get master node id
+    # Get cluster-manager node id
    - do:
        cluster.state: {}
-    - set: { master_node: master }
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains: { nodes.$master.plugins: { name: custom-significance-heuristic } }
+    - contains: { nodes.$cluster_manager.plugins: { name: custom-significance-heuristic } }
--- a/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml
+++ b/plugins/examples/custom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: custom-suggester } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: custom-suggester } }
--- a/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml
+++ b/plugins/examples/painless-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: painless-whitelist } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: painless-whitelist } }
--- a/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml
+++ b/plugins/examples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: example-rescore } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: example-rescore } }
--- a/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml
+++ b/plugins/examples/script-expert-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: script-expert-scoring } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: script-expert-scoring } }
--- a/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml
+++ b/plugins/ingest-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml
@ -5,10 +5,10 @@
    - do:
        cluster.state: {}

-    - set: {master_node: master}
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { 'nodes.$master.plugins': { name: ingest-attachment }  }
-    - contains:  { 'nodes.$master.ingest.processors': { type: attachment } }
+    - contains:  { 'nodes.$cluster_manager.plugins': { name: ingest-attachment }  }
+    - contains:  { 'nodes.$cluster_manager.ingest.processors': { type: attachment } }
--- a/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml
+++ b/plugins/repository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: repository-azure } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: repository-azure } }
--- a/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml
+++ b/plugins/repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: repository-gcs } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: repository-gcs } }
--- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml
+++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml
@ -9,13 +9,13 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: repository-hdfs } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: repository-hdfs } }
 ---
 #
 # Check that we can't use file:// repositories or anything like that
--- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml
+++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml
@ -9,13 +9,13 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: repository-hdfs } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: repository-hdfs } }
 ---
 #
 # Check that we can't use file:// repositories or anything like that
--- a/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml
+++ b/plugins/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: repository-s3 } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: repository-s3 } }
--- a/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml
+++ b/plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml
@ -7,10 +7,10 @@
    - do:
        cluster.state: {}

-    # Get master node id
-    - set: { master_node: master }
+    # Get cluster-manager node id
+    - set: { cluster_manager_node: cluster_manager }

    - do:
        nodes.info: {}

-    - contains:  { nodes.$master.plugins: { name: store-smb } }
+    - contains:  { nodes.$cluster_manager.plugins: { name: store-smb } }