Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b2c5fd3

Browse files
grcevskigrcevski
authored
[TEST] Switch to persistent settings in java tests (#78562)
Migrate to persistent cluster settings in Java tests We are deprecating transient settings, therefore this PR changes uses of transient cluster settings to persistent cluster settings.
1 parent d7aa9e7 commit b2c5fd3

File tree

82 files changed

+530
-470
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+530
-470
lines changed

‎client/rest-high-level/src/test/java/org/elasticsearch/client/ClusterClientIT.java

+28-17
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import java.util.HashMap;
5050
import java.util.List;
5151
import java.util.Map;
52+
import java.util.function.BiConsumer;
5253

5354
import static java.util.Collections.emptyMap;
5455
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
@@ -75,13 +76,13 @@ public void testClusterPutSettings() throws IOException {
7576
setRequest.persistentSettings(map);
7677

7778
ClusterUpdateSettingsResponse setResponse = execute(setRequest, highLevelClient().cluster()::putSettings,
78-
highLevelClient().cluster()::putSettingsAsync);
79+
highLevelClient().cluster()::putSettingsAsync);
7980

8081
assertAcked(setResponse);
8182
assertThat(setResponse.getTransientSettings().get(transientSettingKey), notNullValue());
8283
assertThat(setResponse.getTransientSettings().get(persistentSettingKey), nullValue());
8384
assertThat(setResponse.getTransientSettings().get(transientSettingKey),
84-
equalTo(transientSettingValue + ByteSizeUnit.BYTES.getSuffix()));
85+
equalTo(transientSettingValue + ByteSizeUnit.BYTES.getSuffix()));
8586
assertThat(setResponse.getPersistentSettings().get(transientSettingKey), nullValue());
8687
assertThat(setResponse.getPersistentSettings().get(persistentSettingKey), notNullValue());
8788
assertThat(setResponse.getPersistentSettings().get(persistentSettingKey), equalTo(persistentSettingValue));
@@ -97,7 +98,7 @@ public void testClusterPutSettings() throws IOException {
9798
resetRequest.persistentSettings("{\"" + persistentSettingKey + "\": null }", XContentType.JSON);
9899

99100
ClusterUpdateSettingsResponse resetResponse = execute(resetRequest, highLevelClient().cluster()::putSettings,
100-
highLevelClient().cluster()::putSettingsAsync);
101+
highLevelClient().cluster()::putSettingsAsync);
101102

102103
assertThat(resetResponse.getTransientSettings().get(transientSettingKey), equalTo(null));
103104
assertThat(resetResponse.getPersistentSettings().get(persistentSettingKey), equalTo(null));
@@ -111,17 +112,28 @@ public void testClusterPutSettings() throws IOException {
111112
assertThat(persistentResetValue, equalTo(null));
112113
}
113114

114-
public void testClusterUpdateSettingNonExistent() {
115+
public void testClusterUpdateTransientSettingNonExistent() {
116+
testClusterUpdateSettingNonExistent((settings, request) -> request.transientSettings(settings), "transient");
117+
}
118+
119+
public void testClusterUpdatePersistentSettingNonExistent() {
120+
testClusterUpdateSettingNonExistent((settings, request) -> request.persistentSettings(settings), "persistent");
121+
}
122+
123+
private void testClusterUpdateSettingNonExistent(
124+
final BiConsumer<Settings.Builder, ClusterUpdateSettingsRequest> consumer,
125+
String label) {
115126
String setting = "no_idea_what_you_are_talking_about";
116127
int value = 10;
117128
ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest();
118-
clusterUpdateSettingsRequest.transientSettings(Settings.builder().put(setting, value).build());
129+
consumer.accept(Settings.builder().put(setting, value), clusterUpdateSettingsRequest);
119130

120131
ElasticsearchException exception = expectThrows(ElasticsearchException.class, () -> execute(clusterUpdateSettingsRequest,
121-
highLevelClient().cluster()::putSettings, highLevelClient().cluster()::putSettingsAsync));
132+
highLevelClient().cluster()::putSettings, highLevelClient().cluster()::putSettingsAsync));
122133
assertThat(exception.status(), equalTo(RestStatus.BAD_REQUEST));
123134
assertThat(exception.getMessage(), equalTo(
124-
"Elasticsearch exception [type=illegal_argument_exception, reason=transient setting [" + setting + "], not recognized]"));
135+
"Elasticsearch exception [type=illegal_argument_exception, reason="
136+
+ label + " setting [" + setting + "], not recognized]"));
125137
}
126138

127139
public void testClusterGetSettings() throws IOException {
@@ -183,7 +195,7 @@ public void testClusterHealthYellowClusterLevel() throws IOException {
183195
ClusterHealthResponse response = execute(request, highLevelClient().cluster()::health, highLevelClient().cluster()::healthAsync);
184196

185197
logger.info("Shard stats\n{}", EntityUtils.toString(
186-
client().performRequest(new Request("GET", "/_cat/shards")).getEntity()));
198+
client().performRequest(new Request("GET", "/_cat/shards")).getEntity()));
187199
assertThat(response.getIndices().size(), equalTo(0));
188200
}
189201

@@ -204,7 +216,7 @@ public void testClusterHealthYellowIndicesLevel() throws IOException {
204216
ClusterHealthResponse response = execute(request, highLevelClient().cluster()::health, highLevelClient().cluster()::healthAsync);
205217

206218
logger.info("Shard stats\n{}", EntityUtils.toString(
207-
client().performRequest(new Request("GET", "/_cat/shards")).getEntity()));
219+
client().performRequest(new Request("GET", "/_cat/shards")).getEntity()));
208220
assertYellowShards(response);
209221
assertThat(response.getIndices().size(), equalTo(2));
210222
for (Map.Entry<String, ClusterIndexHealth> entry : response.getIndices().entrySet()) {
@@ -226,7 +238,6 @@ private static void assertYellowShards(ClusterHealthResponse response) {
226238
assertThat(response.getUnassignedShards(), equalTo(2));
227239
}
228240

229-
230241
public void testClusterHealthYellowSpecificIndex() throws IOException {
231242
createIndex("index", Settings.EMPTY);
232243
createIndex("index2", Settings.EMPTY);
@@ -317,19 +328,19 @@ public void testRemoteInfo() throws Exception {
317328
ClusterGetSettingsResponse settingsResponse = highLevelClient().cluster().getSettings(settingsRequest, RequestOptions.DEFAULT);
318329

319330
List<String> seeds = SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS
320-
.getConcreteSettingForNamespace(clusterAlias)
321-
.get(settingsResponse.getTransientSettings());
331+
.getConcreteSettingForNamespace(clusterAlias)
332+
.get(settingsResponse.getPersistentSettings());
322333
int connectionsPerCluster = SniffConnectionStrategy.REMOTE_CONNECTIONS_PER_CLUSTER
323-
.get(settingsResponse.getTransientSettings());
334+
.get(settingsResponse.getPersistentSettings());
324335
TimeValue initialConnectionTimeout = RemoteClusterService.REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING
325-
.get(settingsResponse.getTransientSettings());
336+
.get(settingsResponse.getPersistentSettings());
326337
boolean skipUnavailable = RemoteClusterService.REMOTE_CLUSTER_SKIP_UNAVAILABLE
327-
.getConcreteSettingForNamespace(clusterAlias)
328-
.get(settingsResponse.getTransientSettings());
338+
.getConcreteSettingForNamespace(clusterAlias)
339+
.get(settingsResponse.getPersistentSettings());
329340

330341
RemoteInfoRequest request = new RemoteInfoRequest();
331342
RemoteInfoResponse response = execute(request, highLevelClient().cluster()::remoteInfo,
332-
highLevelClient().cluster()::remoteInfoAsync);
343+
highLevelClient().cluster()::remoteInfoAsync);
333344

334345
assertThat(response, notNullValue());
335346
assertThat(response.getInfos().size(), equalTo(1));

‎client/rest-high-level/src/test/java/org/elasticsearch/client/ESRestHighLevelClientTestCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ protected static void setupRemoteClusterConfig(String remoteClusterName) throws
316316
String transportAddress = (String) nodesResponse.get("transport_address");
317317

318318
ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
319-
updateSettingsRequest.transientSettings(singletonMap("cluster.remote." + remoteClusterName + ".seeds", transportAddress));
319+
updateSettingsRequest.persistentSettings(singletonMap("cluster.remote." + remoteClusterName + ".seeds", transportAddress));
320320
ClusterUpdateSettingsResponse updateSettingsResponse =
321321
restHighLevelClient.cluster().putSettings(updateSettingsRequest, RequestOptions.DEFAULT);
322322
assertThat(updateSettingsResponse.isAcknowledged(), is(true));

‎client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java

+17-31
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.elasticsearch.cluster.metadata.AliasMetadata;
3636
import org.elasticsearch.cluster.metadata.ComponentTemplate;
3737
import org.elasticsearch.cluster.metadata.Template;
38-
import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider;
3938
import org.elasticsearch.common.Priority;
4039
import org.elasticsearch.common.compress.CompressedXContent;
4140
import org.elasticsearch.common.settings.Settings;
@@ -71,48 +70,38 @@ public void testClusterPutSettings() throws IOException {
7170
// end::put-settings-request
7271

7372
// tag::put-settings-create-settings
74-
String transientSettingKey =
75-
RecoverySettings.INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey();
76-
int transientSettingValue = 10;
77-
Settings transientSettings =
78-
Settings.builder()
79-
.put(transientSettingKey, transientSettingValue, ByteSizeUnit.BYTES)
80-
.build(); // <1>
81-
8273
String persistentSettingKey =
83-
EnableAllocationDecider.CLUSTER_ROUTING_ALLOCATION_ENABLE_SETTING.getKey();
84-
String persistentSettingValue =
85-
EnableAllocationDecider.Allocation.NONE.name();
74+
RecoverySettings.INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey();
75+
int persistentSettingValue = 10;
8676
Settings persistentSettings =
8777
Settings.builder()
88-
.put(persistentSettingKey, persistentSettingValue)
89-
.build(); // <2>
78+
.put(persistentSettingKey, persistentSettingValue, ByteSizeUnit.BYTES)
79+
.build(); // <1>
9080
// end::put-settings-create-settings
9181

9282
// tag::put-settings-request-cluster-settings
93-
request.transientSettings(transientSettings); // <1>
94-
request.persistentSettings(persistentSettings); // <2>
83+
request.persistentSettings(persistentSettings); // <1>
9584
// end::put-settings-request-cluster-settings
9685

9786
{
9887
// tag::put-settings-settings-builder
99-
Settings.Builder transientSettingsBuilder =
88+
Settings.Builder persistentSettingsBuilder =
10089
Settings.builder()
101-
.put(transientSettingKey, transientSettingValue, ByteSizeUnit.BYTES);
102-
request.transientSettings(transientSettingsBuilder); // <1>
90+
.put(persistentSettingKey, persistentSettingValue, ByteSizeUnit.BYTES);
91+
request.persistentSettings(persistentSettingsBuilder); // <1>
10392
// end::put-settings-settings-builder
10493
}
10594
{
10695
// tag::put-settings-settings-map
10796
Map<String, Object> map = new HashMap<>();
108-
map.put(transientSettingKey
109-
, transientSettingValue + ByteSizeUnit.BYTES.getSuffix());
110-
request.transientSettings(map); // <1>
97+
map.put(persistentSettingKey
98+
, persistentSettingValue + ByteSizeUnit.BYTES.getSuffix());
99+
request.persistentSettings(map); // <1>
111100
// end::put-settings-settings-map
112101
}
113102
{
114103
// tag::put-settings-settings-source
115-
request.transientSettings(
104+
request.persistentSettings(
116105
"{\"indices.recovery.max_bytes_per_sec\": \"10b\"}"
117106
, XContentType.JSON); // <1>
118107
// end::put-settings-settings-source
@@ -133,17 +122,14 @@ public void testClusterPutSettings() throws IOException {
133122

134123
// tag::put-settings-response
135124
boolean acknowledged = response.isAcknowledged(); // <1>
136-
Settings transientSettingsResponse = response.getTransientSettings(); // <2>
137-
Settings persistentSettingsResponse = response.getPersistentSettings(); // <3>
125+
Settings persistentSettingsResponse = response.getPersistentSettings(); // <2>
138126
// end::put-settings-response
139127
assertTrue(acknowledged);
140-
assertThat(transientSettingsResponse.get(transientSettingKey), equalTo(transientSettingValue + ByteSizeUnit.BYTES.getSuffix()));
141-
assertThat(persistentSettingsResponse.get(persistentSettingKey), equalTo(persistentSettingValue));
128+
assertThat(persistentSettingsResponse.get(persistentSettingKey), equalTo(persistentSettingValue + ByteSizeUnit.BYTES.getSuffix()));
142129

143-
// tag::put-settings-request-reset-transient
144-
request.transientSettings(Settings.builder().putNull(transientSettingKey).build()); // <1>
145-
// tag::put-settings-request-reset-transient
146-
request.persistentSettings(Settings.builder().putNull(persistentSettingKey));
130+
// tag::put-settings-request-reset-persistent
131+
request.persistentSettings(Settings.builder().putNull(persistentSettingKey).build()); // <1>
132+
// tag::put-settings-request-reset-persistent
147133
ClusterUpdateSettingsResponse resetResponse = client.cluster().putSettings(request, RequestOptions.DEFAULT);
148134

149135
assertTrue(resetResponse.isAcknowledged());

‎modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryBasicTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,6 @@ private void setDiskAllocationDeciderEnabled(boolean value) {
367367
DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING.getKey()).build() :
368368
Settings.builder().put(
369369
DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING.getKey(), value).build();
370-
assertAcked(client().admin().cluster().prepareUpdateSettings().setTransientSettings(settings).get());
370+
assertAcked(client().admin().cluster().prepareUpdateSettings().setPersistentSettings(settings).get());
371371
}
372372
}

‎modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4HttpRequestSizeLimitIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void testDoesNotLimitExcludedRequests() throws Exception {
101101
List<Tuple<String, CharSequence>> requestUris = new ArrayList<>();
102102
for (int i = 0; i < 1500; i++) {
103103
requestUris.add(Tuple.tuple("/_cluster/settings",
104-
"{ \"transient\": {\"search.default_search_timeout\": \"40s\" } }"));
104+
"{ \"persistent\": {\"search.default_search_timeout\": \"40s\" } }"));
105105
}
106106

107107
HttpServerTransport httpServerTransport = internalCluster().getInstance(HttpServerTransport.class);

‎qa/smoke-test-http/src/test/java/org/elasticsearch/http/AutoCreateIndexIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void testCannotAutoCreateIndexWhenDisallowedByTemplate() throws IOExcepti
8383
private void configureAutoCreateIndex(boolean value) throws IOException {
8484
XContentBuilder builder = JsonXContent.contentBuilder()
8585
.startObject()
86-
.startObject("transient")
86+
.startObject("persistent")
8787
.field(AutoCreateIndex.AUTO_CREATE_INDEX_SETTING.getKey(), value)
8888
.endObject()
8989
.endObject();

‎server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ public void testWorseBalance() throws Exception {
701701
prepareIndex(5, 0);
702702

703703
logger.info("--> setting balancing threshold really high, so it won't be met");
704-
client().admin().cluster().prepareUpdateSettings().setTransientSettings(
704+
client().admin().cluster().prepareUpdateSettings().setPersistentSettings(
705705
Settings.builder().put("cluster.routing.allocation.balance.threshold", 1000.0f)).get();
706706

707707
logger.info("--> starting another node, with the rebalance threshold so high, it should not get any shards");

‎server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void testCreateCloneIndex() {
5757

5858
// disable rebalancing to be able to capture the right stats. balancing can move the target primary
5959
// making it hard to pin point the source shards.
60-
client().admin().cluster().prepareUpdateSettings().setTransientSettings(Settings.builder().put(
60+
client().admin().cluster().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(
6161
EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), "none"
6262
)).get();
6363
try {
@@ -105,7 +105,7 @@ public void testCreateCloneIndex() {
105105
assertEquals(version, target.getIndexToSettings().get("target").getAsVersion("index.version.created", null));
106106
} finally {
107107
// clean up
108-
client().admin().cluster().prepareUpdateSettings().setTransientSettings(Settings.builder().put(
108+
client().admin().cluster().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(
109109
EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), (String)null
110110
)).get();
111111
}

‎server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public void testCreateShrinkIndex() {
255255

256256
// disable rebalancing to be able to capture the right stats. balancing can move the target primary
257257
// making it hard to pin point the source shards.
258-
client().admin().cluster().prepareUpdateSettings().setTransientSettings(Settings.builder().put(
258+
client().admin().cluster().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(
259259
EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), "none"
260260
)).get();
261261

@@ -321,7 +321,7 @@ public void testCreateShrinkIndex() {
321321
assertEquals(version, target.getIndexToSettings().get("target").getAsVersion("index.version.created", null));
322322

323323
// clean up
324-
client().admin().cluster().prepareUpdateSettings().setTransientSettings(Settings.builder().put(
324+
client().admin().cluster().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(
325325
EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), (String)null
326326
)).get();
327327
}
@@ -496,7 +496,7 @@ public void testShrinkCommitsMergeOnIdle() throws Exception {
496496

497497
// disable rebalancing to be able to capture the right stats. balancing can move the target primary
498498
// making it hard to pin point the source shards.
499-
client().admin().cluster().prepareUpdateSettings().setTransientSettings(Settings.builder().put(
499+
client().admin().cluster().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(
500500
EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), "none"
501501
)).get();
502502

@@ -537,7 +537,7 @@ public void testShrinkCommitsMergeOnIdle() throws Exception {
537537
});
538538

539539
// clean up
540-
client().admin().cluster().prepareUpdateSettings().setTransientSettings(Settings.builder().put(
540+
client().admin().cluster().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(
541541
EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), (String)null
542542
)).get();
543543
}

‎server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ public void testCreateSplitIndex() throws Exception {
369369

370370
// disable rebalancing to be able to capture the right stats. balancing can move the target primary
371371
// making it hard to pin point the source shards.
372-
client().admin().cluster().prepareUpdateSettings().setTransientSettings(Settings.builder().put(
372+
client().admin().cluster().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(
373373
EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), "none"
374374
)).get();
375375
try {
@@ -433,7 +433,7 @@ public void testCreateSplitIndex() throws Exception {
433433
assertEquals(version, target.getIndexToSettings().get("target").getAsVersion("index.version.created", null));
434434
} finally {
435435
// clean up
436-
client().admin().cluster().prepareUpdateSettings().setTransientSettings(Settings.builder().put(
436+
client().admin().cluster().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(
437437
EnableAllocationDecider.CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), (String)null
438438
)).get();
439439
}

0 commit comments

Comments
 (0)