Skip to content

Commit 77a3d30

Browse files
DaveCTurnerDaveCTurner
authored
Remove trappy timeouts from IndicesAliasesRequest (elastic#123987)
Relates elastic#107984
1 parent 404c9e6 commit 77a3d30

File tree

76 files changed

+758
-336
lines changed

Some content is hidden

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

76 files changed

+758
-336
lines changed

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

Lines changed: 31 additions & 25 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void testBasicMigration() throws Exception {
5757
indexDocs("index2", numDocs2);
5858

5959
String alias = "migrate-to-data-stream";
60-
IndicesAliasesRequest request = new IndicesAliasesRequest();
60+
IndicesAliasesRequest request = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
6161
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index1").alias(alias).writeIndex(true));
6262
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index2").alias(alias).writeIndex(false));
6363
assertAcked(indicesAdmin().aliases(request).get());
@@ -99,7 +99,7 @@ public void testMigrationWithoutTemplate() throws Exception {
9999
indexDocs("index2", numDocs2);
100100

101101
String alias = "migrate-to-data-stream";
102-
IndicesAliasesRequest request = new IndicesAliasesRequest();
102+
IndicesAliasesRequest request = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
103103
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index1").alias(alias).writeIndex(true));
104104
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index2").alias(alias).writeIndex(false));
105105
assertAcked(indicesAdmin().aliases(request).get());
@@ -134,7 +134,7 @@ public void testMigrationWithoutIndexMappings() throws Exception {
134134
indicesAdmin().create(new CreateIndexRequest("index2")).get();
135135

136136
String alias = "migrate-to-data-stream";
137-
IndicesAliasesRequest request = new IndicesAliasesRequest();
137+
IndicesAliasesRequest request = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
138138
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index1").alias(alias).writeIndex(true));
139139
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index2").alias(alias).writeIndex(false));
140140
assertAcked(indicesAdmin().aliases(request).get());
@@ -172,7 +172,7 @@ public void testMigrationWithoutTimestampMapping() throws Exception {
172172
indexDocs("index2", numDocs2, "foo");
173173

174174
String alias = "migrate-to-data-stream";
175-
IndicesAliasesRequest request = new IndicesAliasesRequest();
175+
IndicesAliasesRequest request = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
176176
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index1").alias(alias).writeIndex(true));
177177
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index2").alias(alias).writeIndex(false));
178178
assertAcked(indicesAdmin().aliases(request).get());
@@ -210,7 +210,7 @@ public void testMigrationWithoutWriteIndex() throws Exception {
210210
indexDocs("index2", numDocs2);
211211

212212
String alias = "migrate-to-data-stream";
213-
IndicesAliasesRequest request = new IndicesAliasesRequest();
213+
IndicesAliasesRequest request = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
214214
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index1").alias(alias).writeIndex(false));
215215
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index2").alias(alias).writeIndex(false));
216216
assertAcked(indicesAdmin().aliases(request).get());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public void setup() throws Exception {
162162
assertEquals(DocWriteResponse.Result.CREATED, indexResponse.getResult());
163163
id = indexResponse.getId();
164164

165-
IndicesAliasesRequest aliasesRequest = new IndicesAliasesRequest();
165+
IndicesAliasesRequest aliasesRequest = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
166166
aliasesRequest.addAliasAction(
167167
new AliasActions(AliasActions.Type.ADD).alias("my-alias").index("ds").filter(QueryBuilders.matchAllQuery())
168168
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ public void testDropping() throws IOException {
265265
public void testDataStreamAlias() throws IOException {
266266
putComposableIndexTemplate(false);
267267
createDataStream();
268-
var indicesAliasesRequest = new IndicesAliasesRequest();
268+
var indicesAliasesRequest = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
269269
indicesAliasesRequest.addAliasAction(
270270
IndicesAliasesRequest.AliasActions.add().alias("some-alias").index(dataStream).writeIndex(true)
271271
);

‎modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/ChildQuerySearchIT.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,9 +1811,13 @@ public void testAliasesFilterWithHasChildQuery() throws Exception {
18111811
refresh();
18121812

18131813
assertAcked(
1814-
indicesAdmin().prepareAliases().addAlias("my-index", "filter1", hasChildQuery("child", matchAllQuery(), ScoreMode.None))
1814+
indicesAdmin().prepareAliases(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
1815+
.addAlias("my-index", "filter1", hasChildQuery("child", matchAllQuery(), ScoreMode.None))
1816+
);
1817+
assertAcked(
1818+
indicesAdmin().prepareAliases(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
1819+
.addAlias("my-index", "filter2", hasParentQuery("parent", matchAllQuery(), false))
18151820
);
1816-
assertAcked(indicesAdmin().prepareAliases().addAlias("my-index", "filter2", hasParentQuery("parent", matchAllQuery(), false)));
18171821

18181822
assertResponse(prepareSearch("filter1"), response -> {
18191823
assertHitCount(response, 1L);

‎modules/rank-eval/src/internalClusterTest/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ public void setup() {
6262
refresh();
6363

6464
// set up an alias that can also be used in tests
65-
assertAcked(indicesAdmin().prepareAliases().addAliasAction(AliasActions.add().index(TEST_INDEX).alias(INDEX_ALIAS)));
65+
assertAcked(
66+
indicesAdmin().prepareAliases(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
67+
.addAliasAction(AliasActions.add().index(TEST_INDEX).alias(INDEX_ALIAS))
68+
);
6669
}
6770

6871
/**

‎server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/alias/ValidateIndicesAliasesRequestIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void testAllowed() {
7878
.putList(IndicesAliasesPlugin.ALLOWED_ORIGINS_SETTING.getKey(), Collections.singletonList("allowed"))
7979
.build();
8080
createIndex("index", settings);
81-
final IndicesAliasesRequest request = new IndicesAliasesRequest().origin("allowed");
81+
final IndicesAliasesRequest request = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).origin("allowed");
8282
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index").alias("alias"));
8383
assertAcked(client().admin().indices().aliases(request).actionGet());
8484
final GetAliasesResponse response = client().admin()
@@ -98,7 +98,7 @@ public void testNotAllowed() {
9898
.build();
9999
createIndex("index", settings);
100100
final String origin = randomFrom("", "not-allowed");
101-
final IndicesAliasesRequest request = new IndicesAliasesRequest().origin(origin);
101+
final IndicesAliasesRequest request = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).origin(origin);
102102
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index").alias("alias"));
103103
final Exception e = expectThrows(IllegalStateException.class, client().admin().indices().aliases(request));
104104
assertThat(e, hasToString(containsString("origin [" + origin + "] not allowed for index [index]")));
@@ -114,7 +114,7 @@ public void testSomeAllowed() {
114114
.build();
115115
createIndex("bar", barIndexSettings);
116116
final String origin = randomFrom("foo_allowed", "bar_allowed");
117-
final IndicesAliasesRequest request = new IndicesAliasesRequest().origin(origin);
117+
final IndicesAliasesRequest request = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).origin(origin);
118118
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("foo").alias("alias"));
119119
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("bar").alias("alias"));
120120
final Exception e = expectThrows(IllegalStateException.class, client().admin().indices().aliases(request));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ private void doCreateTest(Runnable runnable, String concreteIndex) {
278278
assertMappingsAndSettings(TestSystemIndexDescriptor.getOldMappings(), concreteIndex);
279279

280280
// Remove the index and alias...
281-
assertAcked(indicesAdmin().prepareAliases().removeAlias(concreteIndex, INDEX_NAME).get());
281+
assertAcked(indicesAdmin().prepareAliases(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).removeAlias(concreteIndex, INDEX_NAME).get());
282282
assertAcked(indicesAdmin().prepareDelete(concreteIndex));
283283

284284
// ...so that we can check that the they will still be auto-created again,

‎server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,9 @@ public void testWaitForRefreshIndexValidation() throws Exception {
313313
prepareCreate("test3").setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numberOfShards))
314314
);
315315
assertAcked(
316-
indicesAdmin().prepareAliases().addAlias("test1", "testAlias"),
317-
indicesAdmin().prepareAliases().addAlias(new String[] { "test2", "test3" }, "testFailedAlias")
316+
indicesAdmin().prepareAliases(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).addAlias("test1", "testAlias"),
317+
indicesAdmin().prepareAliases(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
318+
.addAlias(new String[] { "test2", "test3" }, "testFailedAlias")
318319
);
319320

320321
long[] validCheckpoints = new long[numberOfShards];

0 commit comments

Comments
 (0)