Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
May 16, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0f621b
Replace 'master' terminology with 'cluster manager' in 'plugins' dire…
May 15, 2022
2ea0e94
Replace master_node with cluster_manager_node in cluster.state API test
May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...lassic/src/yamlRestTest/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
2 changes: 1 addition & 1 deletion ...nternalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions ...ns/discovery-ec2/src/yamlRestTest/resources/rest-api-spec/test/discovery_ec2/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
8 changes: 4 additions & 4 deletions ...overy-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ protected Settings nodeSettings(int nodeOrdinal) {
}

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")
Expand Down
6 changes: 3 additions & 3 deletions ...ns/discovery-gce/src/yamlRestTest/resources/rest-api-spec/test/discovery_gce/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions .../src/yamlRestTest/resources/rest-api-spec/test/custom-significance-heuristic/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions ...tom-suggester/src/yamlRestTest/resources/rest-api-spec/test/custom-suggester/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions ...s-whitelist/src/yamlRestTest/resources/rest-api-spec/test/painless_whitelist/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions ...amples/rescore/src/yamlRestTest/resources/rest-api-spec/test/example-rescore/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions ...-scoring/src/yamlRestTest/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions ...t-attachment/src/yamlRestTest/resources/rest-api-spec/test/ingest_attachment/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions ...ository-azure/src/yamlRestTest/resources/rest-api-spec/test/repository_azure/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions .../repository-gcs/src/yamlRestTest/resources/rest-api-spec/test/repository_gcs/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...ns/repository-s3/src/yamlRestTest/resources/rest-api-spec/test/repository_s3/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
6 changes: 3 additions & 3 deletions plugins/store-smb/src/yamlRestTest/resources/rest-api-spec/test/store_smb/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }