Skip to content

Commit 84b8c3d

Browse files
nielsbaumannielsbauman
committed
Remove test usages of getDefaultBackingIndexName in DS and LogsDB tests (#127384)
We replace usages of time sensitive `DataStream#getDefaultBackingIndexName` with the retrieval of the name via an API call. The problem with using the time sensitive method is that we can have test failures around midnight. Relates #123376
1 parent a679a1a commit 84b8c3d

File tree

5 files changed

+20
-25
lines changed

5 files changed

+20
-25
lines changed

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ public void testBasicScenario() throws Exception {
201201
int numDocsFoo = randomIntBetween(2, 16);
202202
indexDocs("metrics-foo", numDocsFoo);
203203

204-
verifyDocs("metrics-bar", numDocsBar, 1, 1);
205-
verifyDocs("metrics-foo", numDocsFoo, 1, 1);
204+
verifyDocs("metrics-bar", numDocsBar);
205+
verifyDocs("metrics-foo", numDocsFoo);
206206

207207
RolloverResponse fooRolloverResponse = indicesAdmin().rolloverIndex(new RolloverRequest("metrics-foo", null)).get();
208208
assertThat(fooRolloverResponse.getNewIndex(), backingIndexEqualTo("metrics-foo", 2));
@@ -233,8 +233,8 @@ public void testBasicScenario() throws Exception {
233233
int numDocsFoo2 = randomIntBetween(2, 16);
234234
indexDocs("metrics-foo", numDocsFoo2);
235235

236-
verifyDocs("metrics-bar", numDocsBar + numDocsBar2, 1, 2);
237-
verifyDocs("metrics-foo", numDocsFoo + numDocsFoo2, 1, 2);
236+
verifyDocs("metrics-bar", numDocsBar + numDocsBar2);
237+
verifyDocs("metrics-foo", numDocsFoo + numDocsFoo2);
238238

239239
DeleteDataStreamAction.Request deleteDataStreamRequest = new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, "metrics-*");
240240
client().execute(DeleteDataStreamAction.INSTANCE, deleteDataStreamRequest).actionGet();
@@ -468,7 +468,7 @@ public void testComposableTemplateOnlyMatchingWithDataStreamName() throws Except
468468

469469
int numDocs = randomIntBetween(2, 16);
470470
indexDocs(dataStreamName, numDocs);
471-
verifyDocs(dataStreamName, numDocs, 1, 1);
471+
verifyDocs(dataStreamName, numDocs);
472472

473473
GetDataStreamAction.Request getDataStreamRequest = new GetDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { "*" });
474474
GetDataStreamAction.Response getDataStreamResponse = client().execute(GetDataStreamAction.INSTANCE, getDataStreamRequest)
@@ -502,7 +502,7 @@ public void testComposableTemplateOnlyMatchingWithDataStreamName() throws Except
502502

503503
int numDocs2 = randomIntBetween(2, 16);
504504
indexDocs(dataStreamName, numDocs2);
505-
verifyDocs(dataStreamName, numDocs + numDocs2, 1, 2);
505+
verifyDocs(dataStreamName, numDocs + numDocs2);
506506

507507
getDataStreamRequest = new GetDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { "*" });
508508
getDataStreamResponse = client().execute(GetDataStreamAction.INSTANCE, getDataStreamRequest).actionGet();
@@ -947,7 +947,7 @@ public void testAliasActionsFailOnDataStreamBackingIndices() throws Exception {
947947
);
948948
client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).get();
949949

950-
String backingIndex = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
950+
String backingIndex = getDataStreamBackingIndexNames(dataStreamName).getFirst();
951951
AliasActions addAction = new AliasActions(AliasActions.Type.ADD).index(backingIndex).aliases("first_gen");
952952
IndicesAliasesRequest aliasesAddRequest = new IndicesAliasesRequest();
953953
aliasesAddRequest.addAliasAction(addAction);
@@ -2035,11 +2035,8 @@ static void verifyDocs(String dataStream, long expectedNumHits, List<String> exp
20352035
});
20362036
}
20372037

2038-
static void verifyDocs(String dataStream, long expectedNumHits, long minGeneration, long maxGeneration) {
2039-
List<String> expectedIndices = new ArrayList<>();
2040-
for (long k = minGeneration; k <= maxGeneration; k++) {
2041-
expectedIndices.add(DataStream.getDefaultBackingIndexName(dataStream, k));
2042-
}
2038+
static void verifyDocs(String dataStream, long expectedNumHits) {
2039+
List<String> expectedIndices = getDataStreamBackingIndexNames(dataStream);
20432040
verifyDocs(dataStream, expectedNumHits, expectedIndices);
20442041
}
20452042

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import org.elasticsearch.action.support.IndicesOptions;
3535
import org.elasticsearch.action.support.master.AcknowledgedResponse;
3636
import org.elasticsearch.client.internal.Client;
37-
import org.elasticsearch.cluster.metadata.DataStream;
3837
import org.elasticsearch.cluster.metadata.DataStreamAlias;
38+
import org.elasticsearch.cluster.metadata.DataStreamTestHelper;
3939
import org.elasticsearch.common.settings.Settings;
4040
import org.elasticsearch.common.unit.ByteSizeUnit;
4141
import org.elasticsearch.index.Index;
@@ -294,8 +294,8 @@ public void testSnapshotAndRestoreInPlace() {
294294
RolloverRequest rolloverRequest = new RolloverRequest("ds", null);
295295
RolloverResponse rolloverResponse = client.admin().indices().rolloverIndex(rolloverRequest).actionGet();
296296
assertThat(rolloverResponse.isRolledOver(), is(true));
297-
String backingIndexAfterSnapshot = DataStream.getDefaultBackingIndexName("ds", 2);
298-
assertThat(rolloverResponse.getNewIndex(), equalTo(backingIndexAfterSnapshot));
297+
String backingIndexAfterSnapshot = getDataStreamBackingIndexNames("ds").getFirst();
298+
assertThat(rolloverResponse.getNewIndex(), DataStreamTestHelper.backingIndexEqualTo("ds", 2));
299299

300300
// Close all backing indices of ds data stream:
301301
CloseIndexRequest closeIndexRequest = new CloseIndexRequest(".ds-ds-*");
@@ -330,7 +330,7 @@ public void testSnapshotAndRestoreInPlace() {
330330
rolloverRequest = new RolloverRequest("ds", null);
331331
rolloverResponse = client.admin().indices().rolloverIndex(rolloverRequest).actionGet();
332332
assertThat(rolloverResponse.isRolledOver(), is(true));
333-
assertThat(rolloverResponse.getNewIndex(), equalTo(DataStream.getDefaultBackingIndexName("ds", 3)));
333+
assertThat(rolloverResponse.getNewIndex(), DataStreamTestHelper.backingIndexEqualTo("ds", 3));
334334
}
335335

336336
public void testFailureStoreSnapshotAndRestore() {
@@ -890,7 +890,7 @@ public void testDataStreamAndBackingIndicesAreRenamedUsingRegex() {
890890
List<GetDataStreamAction.Response.DataStreamInfo> dataStreamInfos = getDataStreamInfo("test-ds");
891891
assertThat(
892892
dataStreamInfos.get(0).getDataStream().getIndices().get(0).getName(),
893-
is(DataStream.getDefaultBackingIndexName("test-ds", 1L))
893+
DataStreamTestHelper.backingIndexEqualTo("test-ds", 1)
894894
);
895895

896896
// data stream "ds" should still exist in the system

‎test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ public static List<String> getDataStreamBackingIndexNames(String dataStreamName,
889889
GetDataStreamAction.Response response = safeGet(
890890
client().execute(
891891
GetDataStreamAction.INSTANCE,
892-
new GetDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { dataStreamName })
892+
new GetDataStreamAction.Request(SAFE_AWAIT_TIMEOUT, new String[] { dataStreamName })
893893
)
894894
);
895895
assertThat(response.getDataStreams().size(), equalTo(1));

‎x-pack/plugin/logsdb/qa/with-basic/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbWithBasicRestIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.logsdb;
99

1010
import org.elasticsearch.client.Request;
11-
import org.elasticsearch.cluster.metadata.DataStream;
1211
import org.elasticsearch.cluster.metadata.IndexMetadata;
1312
import org.elasticsearch.common.settings.Settings;
1413
import org.elasticsearch.index.IndexSettings;
@@ -200,7 +199,7 @@ public void testLogsdbOverrideDefaultModeForLogsIndex() throws IOException {
200199
""");
201200
assertOK(client().performRequest(request));
202201

203-
String index = DataStream.getDefaultBackingIndexName("logs-test-foo", 1);
202+
String index = getDataStreamBackingIndexNames("logs-test-foo").getFirst();
204203
var settings = (Map<?, ?>) ((Map<?, ?>) getIndexSettings(index).get(index)).get("settings");
205204
assertEquals("logsdb", settings.get("index.mode"));
206205
assertEquals(SourceFieldMapper.Mode.STORED.toString(), settings.get("index.mapping.source.mode"));
@@ -253,7 +252,7 @@ public void testLogsdbRouteOnSortFields() throws IOException {
253252
""");
254253
assertOK(client().performRequest(request));
255254

256-
String index = DataStream.getDefaultBackingIndexName("my-log-foo", 1);
255+
String index = getDataStreamBackingIndexNames("my-log-foo").getFirst();
257256
var settings = (Map<?, ?>) ((Map<?, ?>) getIndexSettings(index).get(index)).get("settings");
258257
assertEquals("logsdb", settings.get("index.mode"));
259258
assertEquals(SourceFieldMapper.Mode.STORED.toString(), settings.get("index.mapping.source.mode"));

‎x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbRestIT.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.xpack.logsdb;
99

1010
import org.elasticsearch.client.Request;
11-
import org.elasticsearch.cluster.metadata.DataStream;
1211
import org.elasticsearch.cluster.metadata.IndexMetadata;
1312
import org.elasticsearch.common.settings.Settings;
1413
import org.elasticsearch.common.time.DateFormatter;
@@ -114,7 +113,7 @@ public void testLogsdbSourceModeForLogsIndex() throws IOException {
114113
""");
115114
assertOK(client().performRequest(request));
116115

117-
String index = DataStream.getDefaultBackingIndexName("logs-test-foo", 1);
116+
String index = getDataStreamBackingIndexNames("logs-test-foo").getFirst();
118117
var settings = (Map<?, ?>) ((Map<?, ?>) getIndexSettings(index).get(index)).get("settings");
119118
assertEquals("logsdb", settings.get("index.mode"));
120119
assertNull(settings.get("index.mapping.source.mode"));
@@ -281,7 +280,7 @@ public void testLogsdbRouteOnSortFields() throws IOException {
281280
""");
282281
assertOK(client().performRequest(request));
283282

284-
String index = DataStream.getDefaultBackingIndexName("my-log-foo", 1);
283+
String index = getDataStreamBackingIndexNames("my-log-foo").getFirst();
285284
var settings = (Map<?, ?>) ((Map<?, ?>) getIndexSettings(index).get(index)).get("settings");
286285
assertEquals("logsdb", settings.get("index.mode"));
287286
assertNull(settings.get("index.mapping.source.mode"));
@@ -335,7 +334,7 @@ public void testLogsdbDefaultWithRecoveryUseSyntheticSource() throws IOException
335334
""");
336335
assertOK(client().performRequest(request));
337336

338-
String index = DataStream.getDefaultBackingIndexName("my-log-foo", 1);
337+
String index = getDataStreamBackingIndexNames("my-log-foo").getFirst();
339338
var settings = (Map<?, ?>) ((Map<?, ?>) getIndexSettings(index).get(index)).get("settings");
340339
assertEquals("logsdb", settings.get("index.mode"));
341340
assertNull(settings.get("index.mapping.source.mode"));

0 commit comments

Comments
 (0)