Skip to content

Commit 1c368c7

Browse files
nielsbaumannielsbauman
authored
Remove trappy timeouts from GetSettingsRequest (#122855)
Relates #107984
1 parent c65596b commit 1c368c7

File tree

65 files changed

+231
-138
lines changed

Some content is hidden

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

65 files changed

+231
-138
lines changed

‎modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ public void testResolvabilityOfDataStreamsInAPIs() throws Exception {
604604
indicesAdmin().prepareUpdateSettings(dataStreamName).setSettings(Settings.builder().put("index.number_of_replicas", 0)),
605605
false
606606
);
607-
verifyResolvability(dataStreamName, indicesAdmin().prepareGetSettings(dataStreamName), false);
607+
verifyResolvability(dataStreamName, indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, dataStreamName), false);
608608
verifyResolvability(dataStreamName, clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, dataStreamName), false);
609609
verifyResolvability(dataStreamName, clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setIndices(dataStreamName), false);
610610
verifyResolvability(dataStreamName, client().prepareFieldCaps(dataStreamName).setFields("*"), false);
@@ -646,7 +646,7 @@ public void testResolvabilityOfDataStreamsInAPIs() throws Exception {
646646
verifyResolvability(wildcardExpression, indicesAdmin().preparePutMapping(wildcardExpression).setSource("""
647647
{"_doc":{"properties": {"my_field":{"type":"keyword"}}}}""", XContentType.JSON), false);
648648
verifyResolvability(wildcardExpression, indicesAdmin().prepareGetMappings(TEST_REQUEST_TIMEOUT, wildcardExpression), false);
649-
verifyResolvability(wildcardExpression, indicesAdmin().prepareGetSettings(wildcardExpression), false);
649+
verifyResolvability(wildcardExpression, indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, wildcardExpression), false);
650650
verifyResolvability(
651651
wildcardExpression,
652652
indicesAdmin().prepareUpdateSettings(wildcardExpression).setSettings(Settings.builder().put("index.number_of_replicas", 0)),
@@ -1230,13 +1230,13 @@ public void testUpdateIndexSettingsViaDataStream() throws Exception {
12301230
assertTrue(rolloverResponse.isRolledOver());
12311231

12321232
// The index settings of all backing indices should be updated:
1233-
GetSettingsResponse getSettingsResponse = indicesAdmin().prepareGetSettings("logs-foobar").get();
1233+
GetSettingsResponse getSettingsResponse = indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, "logs-foobar").get();
12341234
assertThat(getSettingsResponse.getIndexToSettings().size(), equalTo(2));
12351235
assertThat(getSettingsResponse.getSetting(backingIndex1, "index.number_of_replicas"), equalTo("1"));
12361236
assertThat(getSettingsResponse.getSetting(backingIndex2, "index.number_of_replicas"), equalTo("1"));
12371237

12381238
setReplicaCount(0, "logs-foobar");
1239-
getSettingsResponse = indicesAdmin().prepareGetSettings("logs-foobar").get();
1239+
getSettingsResponse = indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, "logs-foobar").get();
12401240
assertThat(getSettingsResponse.getIndexToSettings().size(), equalTo(2));
12411241
assertThat(getSettingsResponse.getSetting(backingIndex1, "index.number_of_replicas"), equalTo("0"));
12421242
assertThat(getSettingsResponse.getSetting(backingIndex2, "index.number_of_replicas"), equalTo("0"));

‎modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/LogsDataStreamIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ private void assertDataStreamBackingIndicesModes(final String dataStreamName, fi
290290
assertThat(backingIndices.getIndices().size(), Matchers.equalTo(modes.size()));
291291
for (final Index index : backingIndices.getIndices()) {
292292
final GetSettingsResponse getSettingsResponse = indicesAdmin().getSettings(
293-
new GetSettingsRequest().indices(index.getName()).includeDefaults(true)
293+
new GetSettingsRequest(TEST_REQUEST_TIMEOUT).indices(index.getName()).includeDefaults(true)
294294
).actionGet();
295295
final Settings settings = getSettingsResponse.getIndexToSettings().get(index.getName());
296296
assertThat(settings.get("index.mode"), Matchers.equalTo(indexModesIterator.next().getName()));

‎modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceIT.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,8 @@ public void testDataLifecycleServiceConfiguresTheMergePolicy() throws Exception
927927
ByteSizeValue targetFloor = DATA_STREAM_MERGE_POLICY_TARGET_FLOOR_SEGMENT_SETTING.get(clusterSettings);
928928

929929
assertBusy(() -> {
930-
GetSettingsRequest getSettingsRequest = new GetSettingsRequest().indices(firstGenerationIndex).includeDefaults(true);
930+
GetSettingsRequest getSettingsRequest = new GetSettingsRequest(TEST_REQUEST_TIMEOUT).indices(firstGenerationIndex)
931+
.includeDefaults(true);
931932
GetSettingsResponse getSettingsResponse = client().execute(GetSettingsAction.INSTANCE, getSettingsRequest).actionGet();
932933
assertThat(
933934
getSettingsResponse.getSetting(firstGenerationIndex, MergePolicyConfig.INDEX_MERGE_POLICY_MERGE_FACTOR_SETTING.getKey()),
@@ -961,7 +962,8 @@ public void testDataLifecycleServiceConfiguresTheMergePolicy() throws Exception
961962
String secondGenerationIndex = getBackingIndices(dataStreamName).get(1);
962963
// check the 2nd generation index picked up the new setting values
963964
assertBusy(() -> {
964-
GetSettingsRequest getSettingsRequest = new GetSettingsRequest().indices(secondGenerationIndex).includeDefaults(true);
965+
GetSettingsRequest getSettingsRequest = new GetSettingsRequest(TEST_REQUEST_TIMEOUT).indices(secondGenerationIndex)
966+
.includeDefaults(true);
965967
GetSettingsResponse getSettingsResponse = client().execute(GetSettingsAction.INSTANCE, getSettingsRequest).actionGet();
966968
assertThat(
967969
getSettingsResponse.getSetting(secondGenerationIndex, MergePolicyConfig.INDEX_MERGE_POLICY_MERGE_FACTOR_SETTING.getKey()),
@@ -1103,7 +1105,8 @@ public void testLifecycleAppliedToFailureStore() throws Exception {
11031105
ByteSizeValue targetFloor = DATA_STREAM_MERGE_POLICY_TARGET_FLOOR_SEGMENT_SETTING.get(clusterSettings);
11041106

11051107
assertBusy(() -> {
1106-
GetSettingsRequest getSettingsRequest = new GetSettingsRequest().indices(firstGenerationIndex).includeDefaults(true);
1108+
GetSettingsRequest getSettingsRequest = new GetSettingsRequest(TEST_REQUEST_TIMEOUT).indices(firstGenerationIndex)
1109+
.includeDefaults(true);
11071110
GetSettingsResponse getSettingsResponse = client().execute(GetSettingsAction.INSTANCE, getSettingsRequest).actionGet();
11081111
assertThat(
11091112
getSettingsResponse.getSetting(firstGenerationIndex, MergePolicyConfig.INDEX_MERGE_POLICY_MERGE_FACTOR_SETTING.getKey()),

‎modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/FeatureMigrationIT.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,11 @@ public void testIndexBlockIsRemovedWhenAliasRequestFails() throws Exception {
308308
});
309309

310310
// Get the settings to see if the write block was removed
311-
var allsettings = client().admin().indices().prepareGetSettings(INTERNAL_UNMANAGED.getIndexPattern()).get().getIndexToSettings();
311+
var allsettings = client().admin()
312+
.indices()
313+
.prepareGetSettings(TEST_REQUEST_TIMEOUT, INTERNAL_UNMANAGED.getIndexPattern())
314+
.get()
315+
.getIndexToSettings();
312316
var internalUnmanagedOldIndexSettings = allsettings.get(".int-unman-old");
313317
var writeBlock = internalUnmanagedOldIndexSettings.get(IndexMetadata.INDEX_BLOCKS_WRITE_SETTING.getKey());
314318
assertThat("Write block on old index should be removed on migration ERROR status", writeBlock, equalTo("false"));

‎server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ public void testPutMapping() {
539539
public void testGetSettings() {
540540
interceptTransportActions(GetSettingsAction.NAME);
541541

542-
GetSettingsRequest getSettingsRequest = new GetSettingsRequest().indices(randomIndicesOrAliases());
542+
GetSettingsRequest getSettingsRequest = new GetSettingsRequest(TEST_REQUEST_TIMEOUT).indices(randomIndicesOrAliases());
543543
internalCluster().coordOnlyNodeClient().admin().indices().getSettings(getSettingsRequest).actionGet();
544544

545545
clearInterceptedActions();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void testCreateCloneIndex() {
101101
flushAndRefresh();
102102
assertHitCount(prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs);
103103
assertHitCount(prepareSearch("source").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs);
104-
GetSettingsResponse target = indicesAdmin().prepareGetSettings("target").get();
104+
GetSettingsResponse target = indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, "target").get();
105105
assertThat(
106106
target.getIndexToSettings().get("target").getAsVersionId("index.version.created", IndexVersion::fromId),
107107
equalTo(version)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void testCreateIndexWithBlocks() {
199199

200200
public void testCreateIndexWithMetadataBlocks() {
201201
assertAcked(prepareCreate("test").setSettings(Settings.builder().put(IndexMetadata.SETTING_BLOCKS_METADATA, true)));
202-
assertBlocked(indicesAdmin().prepareGetSettings("test"), IndexMetadata.INDEX_METADATA_BLOCK);
202+
assertBlocked(indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, "test"), IndexMetadata.INDEX_METADATA_BLOCK);
203203
disableIndexBlock("test", IndexMetadata.SETTING_BLOCKS_METADATA);
204204
}
205205

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,9 @@ private void assertMappingsAndSettings(String expectedMappings, String concreteI
371371

372372
assertThat(sourceAsMap, equalTo(XContentHelper.convertToMap(XContentType.JSON.xContent(), expectedMappings, false)));
373373

374-
final GetSettingsResponse getSettingsResponse = indicesAdmin().getSettings(new GetSettingsRequest().indices(INDEX_NAME))
375-
.actionGet();
374+
final GetSettingsResponse getSettingsResponse = indicesAdmin().getSettings(
375+
new GetSettingsRequest(TEST_REQUEST_TIMEOUT).indices(INDEX_NAME)
376+
).actionGet();
376377

377378
final Settings actual = getSettingsResponse.getIndexToSettings().get(concreteIndex);
378379

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ public void testCreateShrinkIndex() {
333333
flushAndRefresh();
334334
assertHitCount(prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs);
335335
assertHitCount(prepareSearch("source").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs);
336-
GetSettingsResponse target = indicesAdmin().prepareGetSettings("target").get();
336+
GetSettingsResponse target = indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, "target").get();
337337
assertThat(
338338
target.getIndexToSettings().get("target").getAsVersionId("index.version.created", IndexVersion::fromId),
339339
equalTo(version)
@@ -475,7 +475,7 @@ public void testCreateShrinkWithIndexSort() throws Exception {
475475
assertNoResizeSourceIndexSettings("target");
476476

477477
flushAndRefresh();
478-
GetSettingsResponse settingsResponse = indicesAdmin().prepareGetSettings("target").get();
478+
GetSettingsResponse settingsResponse = indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, "target").get();
479479
assertEquals(settingsResponse.getSetting("target", "index.sort.field"), "id");
480480
assertEquals(settingsResponse.getSetting("target", "index.sort.order"), "desc");
481481
assertSortedSegments("target", expectedIndexSort);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public void testCreateSplitIndex() {
425425
flushAndRefresh();
426426
assertHitCount(prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs);
427427
assertHitCount(prepareSearch("source").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs);
428-
GetSettingsResponse target = indicesAdmin().prepareGetSettings("target").get();
428+
GetSettingsResponse target = indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, "target").get();
429429
assertThat(
430430
target.getIndexToSettings().get("target").getAsVersionId("index.version.created", IndexVersion::fromId),
431431
equalTo(version)
@@ -483,7 +483,7 @@ public void testCreateSplitWithIndexSort() throws Exception {
483483
);
484484
ensureGreen();
485485
flushAndRefresh();
486-
GetSettingsResponse settingsResponse = indicesAdmin().prepareGetSettings("target").get();
486+
GetSettingsResponse settingsResponse = indicesAdmin().prepareGetSettings(TEST_REQUEST_TIMEOUT, "target").get();
487487
assertEquals(settingsResponse.getSetting("target", "index.sort.field"), "id");
488488
assertEquals(settingsResponse.getSetting("target", "index.sort.order"), "desc");
489489
assertSortedSegments("target", expectedIndexSort);

0 commit comments

Comments
 (0)