From 5a02949bbe45187b7b9f2bfb17480fe2171ef6fa Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Mon, 16 May 2022 05:46:01 -0700 Subject: [PATCH] Replace 'master' terminology with 'cluster manager' in 'modules' directory (#3328) * Replace 'master' terminology with 'cluster manager' in modules directory Signed-off-by: Tianli Feng * Replace 'master' with 'cluster_manager' in yaml rest test files Signed-off-by: Tianli Feng * Replace master_node with cluster_manager_node in cluster.state API test Signed-off-by: Tianli Feng --- .../rest-api-spec/test/stats/10_basic.yml | 6 +- .../test/analysis-common/10_basic.yml | 6 +- .../rest-api-spec/test/ingest/10_basic.yml | 54 +++++++------- .../rest-api-spec/test/ingest/70_bulk.yml | 40 +++++------ .../geoip/DatabaseReaderLazyLoader.java | 2 +- .../test/ingest_geoip/10_basic.yml | 6 +- .../test/ingest-useragent/10_basic.yml | 6 +- .../test/lang_expression/10_basic.yml | 6 +- .../test/lang_mustache/10_basic.yml | 6 +- .../rest-api-spec/test/painless/10_basic.yml | 6 +- .../index/mapper/metricbeat-6.0.template.json | 4 +- .../join/aggregations/ChildrenIT.java | 10 ++- .../opensearch/index/reindex/RetryTests.java | 14 ++-- .../rest-api-spec/test/reindex/90_remote.yml | 72 +++++++++---------- .../test/reindex/95_parent_join.yml | 8 +-- .../test/repository_url/10_basic.yml | 6 +- .../resources/rest-api-spec/test/10_basic.yml | 6 +- 17 files changed, 128 insertions(+), 130 deletions(-) diff --git a/modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/10_basic.yml b/modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/10_basic.yml index 2416d2b2b31..b983a3960c6 100644 --- a/modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/10_basic.yml +++ b/modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/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.modules: { name: aggs-matrix-stats } } + - contains: { nodes.$cluster_manager.modules: { name: aggs-matrix-stats } } diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/10_basic.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/10_basic.yml index ca6cd2e953b..c4243879749 100644 --- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/10_basic.yml +++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/10_basic.yml @@ -5,10 +5,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.modules: { name: analysis-common } } + - contains: { nodes.$cluster_manager.modules: { name: analysis-common } } diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml index 8a803eae1fc..f44cc1f9f9f 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml @@ -5,34 +5,34 @@ - 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.modules: { name: ingest-common } } - - contains: { nodes.$master.ingest.processors: { type: append } } - - contains: { nodes.$master.ingest.processors: { type: bytes } } - - contains: { nodes.$master.ingest.processors: { type: convert } } - - contains: { nodes.$master.ingest.processors: { type: date } } - - contains: { nodes.$master.ingest.processors: { type: date_index_name } } - - contains: { nodes.$master.ingest.processors: { type: dissect } } - - contains: { nodes.$master.ingest.processors: { type: dot_expander } } - - contains: { nodes.$master.ingest.processors: { type: fail } } - - contains: { nodes.$master.ingest.processors: { type: foreach } } - - contains: { nodes.$master.ingest.processors: { type: grok } } - - contains: { nodes.$master.ingest.processors: { type: gsub } } - - contains: { nodes.$master.ingest.processors: { type: html_strip } } - - contains: { nodes.$master.ingest.processors: { type: join } } - - contains: { nodes.$master.ingest.processors: { type: json } } - - contains: { nodes.$master.ingest.processors: { type: kv } } - - contains: { nodes.$master.ingest.processors: { type: lowercase } } - - contains: { nodes.$master.ingest.processors: { type: remove } } - - contains: { nodes.$master.ingest.processors: { type: rename } } - - contains: { nodes.$master.ingest.processors: { type: script } } - - contains: { nodes.$master.ingest.processors: { type: set } } - - contains: { nodes.$master.ingest.processors: { type: sort } } - - contains: { nodes.$master.ingest.processors: { type: split } } - - contains: { nodes.$master.ingest.processors: { type: trim } } - - contains: { nodes.$master.ingest.processors: { type: uppercase } } + - contains: { nodes.$cluster_manager.modules: { name: ingest-common } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: append } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: bytes } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: convert } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: date } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: date_index_name } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: dissect } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: dot_expander } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: fail } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: foreach } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: grok } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: gsub } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: html_strip } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: join } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: json } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: kv } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: lowercase } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: remove } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: rename } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: script } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: set } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: sort } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: split } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: trim } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: uppercase } } diff --git a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml index 5b442456e64..2dfa17174b1 100644 --- a/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml +++ b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml @@ -77,21 +77,21 @@ teardown: - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { cluster_manager_node: cluster_manager } - do: nodes.stats: metric: [ ingest ] #we can't assert anything here since we might have more than one node in the cluster - - gte: {nodes.$master.ingest.total.count: 0} - - gte: {nodes.$master.ingest.total.failed: 0} - - gte: {nodes.$master.ingest.total.time_in_millis: 0} - - match: {nodes.$master.ingest.total.current: 0} - - gte: {nodes.$master.ingest.pipelines.pipeline1.count: 0} - - match: {nodes.$master.ingest.pipelines.pipeline1.failed: 0} - - gte: {nodes.$master.ingest.pipelines.pipeline1.time_in_millis: 0} - - match: {nodes.$master.ingest.pipelines.pipeline1.current: 0} + - gte: {nodes.$cluster_manager.ingest.total.count: 0} + - gte: {nodes.$cluster_manager.ingest.total.failed: 0} + - gte: {nodes.$cluster_manager.ingest.total.time_in_millis: 0} + - match: {nodes.$cluster_manager.ingest.total.current: 0} + - gte: {nodes.$cluster_manager.ingest.pipelines.pipeline1.count: 0} + - match: {nodes.$cluster_manager.ingest.pipelines.pipeline1.failed: 0} + - gte: {nodes.$cluster_manager.ingest.pipelines.pipeline1.time_in_millis: 0} + - match: {nodes.$cluster_manager.ingest.pipelines.pipeline1.current: 0} --- "Test bulk request with default pipeline": @@ -113,21 +113,21 @@ teardown: - do: cluster.state: {} - # Get master node id - - set: { master_node: master } + # Get cluster-manager node id + - set: { cluster_manager_node: cluster_manager } - do: nodes.stats: metric: [ ingest ] #we can't assert anything here since we might have more than one node in the cluster - - gte: {nodes.$master.ingest.total.count: 0} - - gte: {nodes.$master.ingest.total.failed: 0} - - gte: {nodes.$master.ingest.total.time_in_millis: 0} - - match: {nodes.$master.ingest.total.current: 0} - - gte: {nodes.$master.ingest.pipelines.pipeline2.count: 0} - - match: {nodes.$master.ingest.pipelines.pipeline2.failed: 0} - - gte: {nodes.$master.ingest.pipelines.pipeline2.time_in_millis: 0} - - match: {nodes.$master.ingest.pipelines.pipeline2.current: 0} + - gte: {nodes.$cluster_manager.ingest.total.count: 0} + - gte: {nodes.$cluster_manager.ingest.total.failed: 0} + - gte: {nodes.$cluster_manager.ingest.total.time_in_millis: 0} + - match: {nodes.$cluster_manager.ingest.total.current: 0} + - gte: {nodes.$cluster_manager.ingest.pipelines.pipeline2.count: 0} + - match: {nodes.$cluster_manager.ingest.pipelines.pipeline2.failed: 0} + - gte: {nodes.$cluster_manager.ingest.pipelines.pipeline2.time_in_millis: 0} + - match: {nodes.$cluster_manager.ingest.pipelines.pipeline2.current: 0} - do: get: diff --git a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java index 1cafae0e50c..70feb44f0f3 100644 --- a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java @@ -71,7 +71,7 @@ class DatabaseReaderLazyLoader implements Closeable { /** * Read the database type from the database. We do this manually instead of relying on the built-in mechanism to avoid reading the - * entire database into memory merely to read the type. This is especially important to maintain on master nodes where pipelines are + * entire database into memory merely to read the type. This is especially important to maintain on cluster-manager nodes where pipelines are * validated. If we read the entire database into memory, we could potentially run into low-memory constraints on such nodes where * loading this data would otherwise be wasteful if they are not also ingest nodes. * diff --git a/modules/ingest-geoip/src/yamlRestTest/resources/rest-api-spec/test/ingest_geoip/10_basic.yml b/modules/ingest-geoip/src/yamlRestTest/resources/rest-api-spec/test/ingest_geoip/10_basic.yml index 5cd45da2bda..3b414022ede 100644 --- a/modules/ingest-geoip/src/yamlRestTest/resources/rest-api-spec/test/ingest_geoip/10_basic.yml +++ b/modules/ingest-geoip/src/yamlRestTest/resources/rest-api-spec/test/ingest_geoip/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.modules: { name: ingest-geoip } } - - contains: { nodes.$master.ingest.processors: { type: geoip } } + - contains: { nodes.$cluster_manager.modules: { name: ingest-geoip } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: geoip } } diff --git a/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/10_basic.yml b/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/10_basic.yml index 327d9cf4512..c0e1d14489a 100644 --- a/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/10_basic.yml +++ b/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/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.modules: { name: ingest-user-agent } } - - contains: { nodes.$master.ingest.processors: { type: user_agent } } + - contains: { nodes.$cluster_manager.modules: { name: ingest-user-agent } } + - contains: { nodes.$cluster_manager.ingest.processors: { type: user_agent } } diff --git a/modules/lang-expression/src/yamlRestTest/resources/rest-api-spec/test/lang_expression/10_basic.yml b/modules/lang-expression/src/yamlRestTest/resources/rest-api-spec/test/lang_expression/10_basic.yml index 00ad6f890b0..d56ad1a8a24 100644 --- a/modules/lang-expression/src/yamlRestTest/resources/rest-api-spec/test/lang_expression/10_basic.yml +++ b/modules/lang-expression/src/yamlRestTest/resources/rest-api-spec/test/lang_expression/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.modules: { name: lang-expression } } + - contains: { nodes.$cluster_manager.modules: { name: lang-expression } } diff --git a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/10_basic.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/10_basic.yml index 0e853d62731..5fc67b766cb 100644 --- a/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/10_basic.yml +++ b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/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.modules: { name: lang-mustache } } + - contains: { nodes.$cluster_manager.modules: { name: lang-mustache } } diff --git a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/10_basic.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/10_basic.yml index e442b40ffb8..a2458269b7a 100644 --- a/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/10_basic.yml +++ b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/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.modules: { name: lang-painless } } + - contains: { nodes.$cluster_manager.modules: { name: lang-painless } } diff --git a/modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/metricbeat-6.0.template.json b/modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/metricbeat-6.0.template.json index f456755feeb..5a83dbd2128 100644 --- a/modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/metricbeat-6.0.template.json +++ b/modules/mapper-extras/src/test/resources/org/opensearch/index/mapper/metricbeat-6.0.template.json @@ -229,7 +229,7 @@ }, "objects": { "properties": { - "master": { + "primary": { "type": "long" }, "total": { @@ -4601,7 +4601,7 @@ "connected_replicas": { "type": "long" }, - "master_offset": { + "primary_offset": { "type": "long" }, "role": { diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java index 08354cbaaf9..72c502c616f 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java @@ -227,7 +227,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { public void testPostCollection() throws Exception { String indexName = "prodcatalog"; - String masterType = "masterprod"; + String mainType = "mainprod"; String childType = "variantsku"; assertAcked( prepareCreate(indexName).setSettings( @@ -235,7 +235,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { ) .setMapping( addFieldMappings( - buildParentJoinFieldMappingFromSimplifiedDef("join_field", true, masterType, childType), + buildParentJoinFieldMappingFromSimplifiedDef("join_field", true, mainType, childType), "brand", "text", "name", @@ -251,7 +251,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { ); List requests = new ArrayList<>(); - requests.add(createIndexRequest(indexName, masterType, "1", null, "brand", "Levis", "name", "Style 501", "material", "Denim")); + requests.add(createIndexRequest(indexName, mainType, "1", null, "brand", "Levis", "name", "Style 501", "material", "Denim")); requests.add(createIndexRequest(indexName, childType, "3", "1", "color", "blue", "size", "32")); requests.add(createIndexRequest(indexName, childType, "4", "1", "color", "blue", "size", "34")); requests.add(createIndexRequest(indexName, childType, "5", "1", "color", "blue", "size", "36")); @@ -259,9 +259,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { requests.add(createIndexRequest(indexName, childType, "7", "1", "color", "black", "size", "40")); requests.add(createIndexRequest(indexName, childType, "8", "1", "color", "gray", "size", "36")); - requests.add( - createIndexRequest(indexName, masterType, "2", null, "brand", "Wrangler", "name", "Regular Cut", "material", "Leather") - ); + requests.add(createIndexRequest(indexName, mainType, "2", null, "brand", "Wrangler", "name", "Regular Cut", "material", "Leather")); requests.add(createIndexRequest(indexName, childType, "9", "2", "color", "blue", "size", "32")); requests.add(createIndexRequest(indexName, childType, "10", "2", "color", "blue", "size", "34")); requests.add(createIndexRequest(indexName, childType, "12", "2", "color", "black", "size", "36")); diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java index 124670dba95..1c1a55bf595 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java @@ -118,18 +118,18 @@ public class RetryTests extends OpenSearchIntegTestCase { public void testReindexFromRemote() throws Exception { Function> function = client -> { /* - * Use the master node for the reindex from remote because that node + * Use the cluster-manager 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 @@ public class RetryTests extends OpenSearchIntegTestCase { */ 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 cluster-manager client because we always start the test requests on the + * cluster-manager. 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(); diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml index ac8d0730ff2..b30f7fc7322 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml @@ -7,15 +7,15 @@ 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: reindex: refresh: true @@ -68,15 +68,15 @@ - do: 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: reindex: refresh: true @@ -118,15 +118,15 @@ 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: reindex: refresh: true @@ -169,15 +169,15 @@ 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: reindex: refresh: true @@ -236,15 +236,15 @@ 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: reindex: refresh: true @@ -302,15 +302,15 @@ 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: reindex: refresh: true @@ -358,15 +358,15 @@ 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: catch: /query malformed, no start_object after query name/ reindex: @@ -411,15 +411,15 @@ 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: reindex: refresh: true @@ -480,15 +480,15 @@ 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: reindex: requests_per_second: .00000001 # About 9.5 years to complete the request diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/95_parent_join.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/95_parent_join.yml index b36593b4b96..a3c2e0505bd 100644 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/95_parent_join.yml +++ b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/95_parent_join.yml @@ -88,15 +88,15 @@ 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 cluster-manager because we know there will always be a cluster-manager. - do: cluster.state: {} - - set: { master_node: master } + - set: { cluster_manager_node: cluster_manager } - do: nodes.info: metric: [ http ] - - is_true: nodes.$master.http.publish_address - - set: {nodes.$master.http.publish_address: host} + - is_true: nodes.$cluster_manager.http.publish_address + - set: {nodes.$cluster_manager.http.publish_address: host} - do: reindex: refresh: true diff --git a/modules/repository-url/src/yamlRestTest/resources/rest-api-spec/test/repository_url/10_basic.yml b/modules/repository-url/src/yamlRestTest/resources/rest-api-spec/test/repository_url/10_basic.yml index b932f0d53ca..0c7aed0ae71 100644 --- a/modules/repository-url/src/yamlRestTest/resources/rest-api-spec/test/repository_url/10_basic.yml +++ b/modules/repository-url/src/yamlRestTest/resources/rest-api-spec/test/repository_url/10_basic.yml @@ -102,13 +102,13 @@ teardown: - 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.modules: { name: repository-url } } + - contains: { nodes.$cluster_manager.modules: { name: repository-url } } --- "Restore with repository-url using http://": diff --git a/modules/transport-netty4/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml b/modules/transport-netty4/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml index 19728c7d34c..f4ac484757a 100644 --- a/modules/transport-netty4/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml +++ b/modules/transport-netty4/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml @@ -7,13 +7,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.modules: { name: transport-netty4 } } + - contains: { nodes.$cluster_manager.modules: { name: transport-netty4 } } - do: cluster.stats: {}