Skip to content

Commit 09714a8

Browse files
jasontedorjasontedor
committed
Generalize search.remote settings to cluster.remote (#33413)
With features like CCR building on the CCS infrastructure, the settings prefix search.remote makes less sense as the namespace for these remote cluster settings than does a more general namespace like cluster.remote. This commit replaces these settings with cluster.remote with a fallback to the deprecated settings search.remote.
1 parent 5ca2e54 commit 09714a8

File tree

30 files changed

+527
-231
lines changed

30 files changed

+527
-231
lines changed

‎docs/reference/modules/cross-cluster-search.asciidoc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ remote clusters that should be connected to, for instance:
3838

3939
[source,yaml]
4040
--------------------------------
41-
search:
41+
cluster:
4242
remote:
4343
cluster_one: <1>
4444
seeds: 127.0.0.1:9300
@@ -58,7 +58,7 @@ following:
5858
PUT _cluster/settings
5959
{
6060
"persistent": {
61-
"search": {
61+
"cluster": {
6262
"remote": {
6363
"cluster_one": {
6464
"seeds": [
@@ -94,7 +94,7 @@ because we'll use them later.
9494
{
9595
"acknowledged" : true,
9696
"persistent": {
97-
"search": {
97+
"cluster": {
9898
"remote": {
9999
"cluster_one": {
100100
"seeds": [
@@ -129,7 +129,7 @@ A remote cluster can be deleted from the cluster settings by setting its seeds t
129129
PUT _cluster/settings
130130
{
131131
"persistent": {
132-
"search": {
132+
"cluster": {
133133
"remote": {
134134
"cluster_three": {
135135
"seeds": null <1>
@@ -310,7 +310,7 @@ boolean `skip_unavailable` setting, set to `false` by default.
310310
PUT _cluster/settings
311311
{
312312
"persistent": {
313-
"search.remote.cluster_two.skip_unavailable": true <1>
313+
"cluster.remote.cluster_two.skip_unavailable": true <1>
314314
}
315315
}
316316
--------------------------------
@@ -392,30 +392,30 @@ GET /cluster_one:twitter,cluster_two:twitter,twitter/_search <1>
392392
[[cross-cluster-search-settings]]
393393
=== Cross cluster search settings
394394

395-
`search.remote.connections_per_cluster`::
395+
`cluster.remote.connections_per_cluster`::
396396

397397
The number of nodes to connect to per remote cluster. The default is `3`.
398398

399-
`search.remote.initial_connect_timeout`::
399+
`cluster.remote.initial_connect_timeout`::
400400

401401
The time to wait for remote connections to be established when the node starts. The default is `30s`.
402402

403-
`search.remote.node.attr`::
403+
`cluster.remote.node.attr`::
404404

405405
A node attribute to filter out nodes that are eligible as a gateway node in
406406
the remote cluster. For instance a node can have a node attribute
407407
`node.attr.gateway: true` such that only nodes with this attribute will be
408-
connected to if `search.remote.node.attr` is set to `gateway`.
408+
connected to if `cluster.remote.node.attr` is set to `gateway`.
409409

410-
`search.remote.connect`::
410+
`cluster.remote.connect`::
411411

412412
By default, any node in the cluster can act as a cross-cluster client and
413-
connect to remote clusters. The `search.remote.connect` setting can be set
413+
connect to remote clusters. The `cluster.remote.connect` setting can be set
414414
to `false` (defaults to `true`) to prevent certain nodes from connecting to
415415
remote clusters. Cross-cluster search requests must be sent to a node that
416416
is allowed to act as a cross-cluster client.
417417

418-
`search.remote.${cluster_alias}.skip_unavailable`::
418+
`cluster.remote.${cluster_alias}.skip_unavailable`::
419419

420420
Per cluster boolean setting that allows to skip specific clusters when no
421421
nodes belonging to them are available and they are searched as part of a

‎docs/reference/modules/ml-node.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ To create a dedicated ingest node when {xpack} is installed, set:
5959
node.master: false <1>
6060
node.data: false <2>
6161
node.ingest: true <3>
62-
search.remote.connect: false <4>
62+
cluster.remote.connect: false <4>
6363
node.ml: false <5>
6464
-------------------
6565
<1> Disable the `node.master` role (enabled by default).
@@ -75,7 +75,7 @@ To create a dedicated coordinating node when {xpack} is installed, set:
7575
node.master: false <1>
7676
node.data: false <2>
7777
node.ingest: false <3>
78-
search.remote.connect: false <4>
78+
cluster.remote.connect: false <4>
7979
node.ml: false <5>
8080
-------------------
8181
<1> Disable the `node.master` role (enabled by default).
@@ -105,7 +105,7 @@ To create a dedicated {ml} node, set:
105105
node.master: false <1>
106106
node.data: false <2>
107107
node.ingest: false <3>
108-
search.remote.connect: false <4>
108+
cluster.remote.connect: false <4>
109109
node.ml: true <5>
110110
xpack.ml.enabled: true <6>
111111
-------------------

‎docs/reference/modules/node.asciidoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ To create a dedicated master-eligible node, set:
104104
node.master: true <1>
105105
node.data: false <2>
106106
node.ingest: false <3>
107-
search.remote.connect: false <4>
107+
cluster.remote.connect: false <4>
108108
-------------------
109109
<1> The `node.master` role is enabled by default.
110110
<2> Disable the `node.data` role (enabled by default).
@@ -203,7 +203,7 @@ To create a dedicated data node, set:
203203
node.master: false <1>
204204
node.data: true <2>
205205
node.ingest: false <3>
206-
search.remote.connect: false <4>
206+
cluster.remote.connect: false <4>
207207
-------------------
208208
<1> Disable the `node.master` role (enabled by default).
209209
<2> The `node.data` role is enabled by default.
@@ -231,7 +231,7 @@ To create a dedicated ingest node, set:
231231
node.master: false <1>
232232
node.data: false <2>
233233
node.ingest: true <3>
234-
search.remote.connect: false <4>
234+
cluster.remote.connect: false <4>
235235
-------------------
236236
<1> Disable the `node.master` role (enabled by default).
237237
<2> Disable the `node.data` role (enabled by default).
@@ -271,7 +271,7 @@ To create a dedicated coordinating node, set:
271271
node.master: false <1>
272272
node.data: false <2>
273273
node.ingest: false <3>
274-
search.remote.connect: false <4>
274+
cluster.remote.connect: false <4>
275275
-------------------
276276
<1> Disable the `node.master` role (enabled by default).
277277
<2> Disable the `node.data` role (enabled by default).

‎qa/ccs-unavailable-clusters/src/test/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ public void testSkipUnavailableDependsOnSeeds() throws IOException {
235235
() -> client().performRequest(request));
236236
assertEquals(400, responseException.getResponse().getStatusLine().getStatusCode());
237237
assertThat(responseException.getMessage(),
238-
containsString("Missing required setting [search.remote.remote1.seeds] " +
239-
"for setting [search.remote.remote1.skip_unavailable]"));
238+
containsString("Missing required setting [cluster.remote.remote1.seeds] " +
239+
"for setting [cluster.remote.remote1.skip_unavailable]"));
240240
}
241241

242242
Map<String, Object> settingsMap = new HashMap<>();
@@ -251,8 +251,8 @@ public void testSkipUnavailableDependsOnSeeds() throws IOException {
251251
ResponseException responseException = expectThrows(ResponseException.class,
252252
() -> client().performRequest(request));
253253
assertEquals(400, responseException.getResponse().getStatusLine().getStatusCode());
254-
assertThat(responseException.getMessage(), containsString("Missing required setting [search.remote.remote1.seeds] " +
255-
"for setting [search.remote.remote1.skip_unavailable]"));
254+
assertThat(responseException.getMessage(), containsString("Missing required setting [cluster.remote.remote1.seeds] " +
255+
"for setting [cluster.remote.remote1.skip_unavailable]"));
256256
}
257257

258258
if (randomBoolean()) {
@@ -304,7 +304,7 @@ private static HttpEntity buildUpdateSettingsRequestBody(Map<String, Object> set
304304
{
305305
builder.startObject("persistent");
306306
{
307-
builder.startObject("search.remote.remote1");
307+
builder.startObject("cluster.remote.remote1");
308308
{
309309
for (Map.Entry<String, Object> entry : settings.entrySet()) {
310310
builder.field(entry.getKey(), entry.getValue());

‎qa/multi-cluster-search/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ task remoteClusterTest(type: RestIntegTestTask) {
2828
remoteClusterTestCluster {
2929
numNodes = 2
3030
clusterName = 'remote-cluster'
31-
setting 'search.remote.connect', false
31+
setting 'cluster.remote.connect', false
3232
}
3333

3434
remoteClusterTestRunner {
@@ -39,9 +39,9 @@ task mixedClusterTest(type: RestIntegTestTask) {}
3939

4040
mixedClusterTestCluster {
4141
dependsOn remoteClusterTestRunner
42-
setting 'search.remote.my_remote_cluster.seeds', "\"${-> remoteClusterTest.nodes.get(0).transportUri()}\""
43-
setting 'search.remote.connections_per_cluster', 1
44-
setting 'search.remote.connect', true
42+
setting 'cluster.remote.my_remote_cluster.seeds', "\"${-> remoteClusterTest.nodes.get(0).transportUri()}\""
43+
setting 'cluster.remote.connections_per_cluster', 1
44+
setting 'cluster.remote.connect', true
4545
}
4646

4747
mixedClusterTestRunner {

‎qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@
9999
cluster.get_settings:
100100
include_defaults: true
101101

102-
- set: { defaults.search.remote.my_remote_cluster.seeds.0: remote_ip }
102+
- set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
103103

104104
- do:
105105
cluster.put_settings:
106106
flat_settings: true
107107
body:
108108
transient:
109-
search.remote.test_remote_cluster.seeds: $remote_ip
109+
cluster.remote.test_remote_cluster.seeds: $remote_ip
110110

111-
- match: {transient: {search.remote.test_remote_cluster.seeds: $remote_ip}}
111+
- match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
112112

113113
- do:
114114
search:
@@ -124,16 +124,16 @@
124124
cluster.get_settings:
125125
include_defaults: true
126126

127-
- set: { defaults.search.remote.my_remote_cluster.seeds.0: remote_ip }
127+
- set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
128128

129129
- do:
130130
cluster.put_settings:
131131
flat_settings: true
132132
body:
133133
transient:
134-
search.remote.test_remote_cluster.seeds: $remote_ip
134+
cluster.remote.test_remote_cluster.seeds: $remote_ip
135135

136-
- match: {transient: {search.remote.test_remote_cluster.seeds: $remote_ip}}
136+
- match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
137137

138138
- do:
139139
search:

‎qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
cluster.get_settings:
1616
include_defaults: true
1717

18-
- set: { defaults.search.remote.my_remote_cluster.seeds.0: remote_ip }
18+
- set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
1919

2020
- do:
2121
cluster.put_settings:
2222
flat_settings: true
2323
body:
2424
transient:
25-
search.remote.test_remote_cluster.seeds: $remote_ip
25+
cluster.remote.test_remote_cluster.seeds: $remote_ip
2626

27-
- match: {transient: {search.remote.test_remote_cluster.seeds: $remote_ip}}
27+
- match: {transient: {cluster.remote.test_remote_cluster.seeds: $remote_ip}}
2828

2929
# we do another search here since this will enforce the connection to be established
3030
# otherwise the cluster might not have been connected yet.
@@ -60,7 +60,7 @@
6060
cluster.put_settings:
6161
body:
6262
transient:
63-
search.remote.test_remote_cluster.seeds: null
63+
cluster.remote.test_remote_cluster.seeds: null
6464

6565
---
6666
"skip_unavailable is returned as part of _remote/info response":
@@ -72,16 +72,16 @@
7272
cluster.get_settings:
7373
include_defaults: true
7474

75-
- set: { defaults.search.remote.my_remote_cluster.seeds.0: remote_ip }
75+
- set: { defaults.cluster.remote.my_remote_cluster.seeds.0: remote_ip }
7676

7777
- do:
7878
cluster.put_settings:
7979
flat_settings: true
8080
body:
8181
transient:
82-
search.remote.remote1.seeds: $remote_ip
82+
cluster.remote.remote1.seeds: $remote_ip
8383

84-
- match: {transient: {search.remote.remote1.seeds: $remote_ip}}
84+
- match: {transient: {cluster.remote.remote1.seeds: $remote_ip}}
8585

8686
- do:
8787
cluster.remote_info: {}
@@ -91,9 +91,9 @@
9191
cluster.put_settings:
9292
body:
9393
transient:
94-
search.remote.remote1.skip_unavailable: true
94+
cluster.remote.remote1.skip_unavailable: true
9595

96-
- is_true: transient.search.remote.remote1.skip_unavailable
96+
- is_true: transient.cluster.remote.remote1.skip_unavailable
9797

9898
- do:
9999
cluster.remote_info: {}
@@ -104,9 +104,9 @@
104104
cluster.put_settings:
105105
body:
106106
transient:
107-
search.remote.remote1.skip_unavailable: false
107+
cluster.remote.remote1.skip_unavailable: false
108108

109-
- is_false: transient.search.remote.remote1.skip_unavailable
109+
- is_false: transient.cluster.remote.remote1.skip_unavailable
110110

111111
- do:
112112
cluster.remote_info: {}
@@ -117,7 +117,7 @@
117117
cluster.put_settings:
118118
body:
119119
transient:
120-
search.remote.remote1.skip_unavailable: null
120+
cluster.remote.remote1.skip_unavailable: null
121121

122122
- match: {transient: {}}
123123

@@ -130,6 +130,5 @@
130130
cluster.put_settings:
131131
body:
132132
transient:
133-
search.remote.remote1.seeds: null
134-
search.remote.remote1.skip_unavailable: null
135-
133+
cluster.remote.remote1.seeds: null
134+
cluster.remote.remote1.skip_unavailable: null

‎server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,19 @@ public void apply(Settings value, Settings current, Settings previous) {
275275
ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING,
276276
TransportSearchAction.SHARD_COUNT_LIMIT_SETTING,
277277
RemoteClusterAware.REMOTE_CLUSTERS_SEEDS,
278+
RemoteClusterAware.SEARCH_REMOTE_CLUSTERS_SEEDS,
278279
RemoteClusterAware.REMOTE_CLUSTERS_PROXY,
280+
RemoteClusterAware.SEARCH_REMOTE_CLUSTERS_PROXY,
279281
RemoteClusterService.REMOTE_CLUSTER_SKIP_UNAVAILABLE,
282+
RemoteClusterService.SEARCH_REMOTE_CLUSTER_SKIP_UNAVAILABLE,
280283
RemoteClusterService.REMOTE_CONNECTIONS_PER_CLUSTER,
284+
RemoteClusterService.SEARCH_REMOTE_CONNECTIONS_PER_CLUSTER,
281285
RemoteClusterService.REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING,
286+
RemoteClusterService.SEARCH_REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING,
282287
RemoteClusterService.REMOTE_NODE_ATTRIBUTE,
288+
RemoteClusterService.SEARCH_REMOTE_NODE_ATTRIBUTE,
283289
RemoteClusterService.ENABLE_REMOTE_CLUSTERS,
290+
RemoteClusterService.SEARCH_ENABLE_REMOTE_CLUSTERS,
284291
TransportService.TRACE_LOG_EXCLUDE_SETTING,
285292
TransportService.TRACE_LOG_INCLUDE_SETTING,
286293
TransportCloseIndexAction.CLUSTER_INDICES_CLOSE_ENABLE_SETTING,

0 commit comments

Comments
 (0)