Skip to content

Remove test usages of getDefaultBackingIndexName in DS and LogsDB tests #127384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+20 −25
Open

Remove test usages of getDefaultBackingIndexName in DS and LogsDB tests #127384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2855f48
Remove test usages of `getDefaultBackingIndexName` in DS and LogsDB t…
nielsbauman Apr 25, 2025
d56761e
[CI] Auto commit changes from spotless
elasticsearchmachine Apr 25, 2025
b03afb6
Merge branch 'main' into remove-ds-logsdb
nielsbauman Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions ...data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ public void testBasicScenario() throws Exception {
int numDocsFoo = randomIntBetween(2, 16);
indexDocs("metrics-foo", numDocsFoo);

verifyDocs("metrics-bar", numDocsBar, 1, 1);
verifyDocs("metrics-foo", numDocsFoo, 1, 1);
verifyDocs("metrics-bar", numDocsBar);
verifyDocs("metrics-foo", numDocsFoo);

RolloverResponse fooRolloverResponse = indicesAdmin().rolloverIndex(new RolloverRequest("metrics-foo", null)).get();
assertThat(fooRolloverResponse.getNewIndex(), backingIndexEqualTo("metrics-foo", 2));
Expand Down Expand Up @@ -234,8 +234,8 @@ public void testBasicScenario() throws Exception {
int numDocsFoo2 = randomIntBetween(2, 16);
indexDocs("metrics-foo", numDocsFoo2);

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

DeleteDataStreamAction.Request deleteDataStreamRequest = new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, "metrics-*");
client().execute(DeleteDataStreamAction.INSTANCE, deleteDataStreamRequest).actionGet();
Expand Down Expand Up @@ -469,7 +469,7 @@ public void testComposableTemplateOnlyMatchingWithDataStreamName() throws Except

int numDocs = randomIntBetween(2, 16);
indexDocs(dataStreamName, numDocs);
verifyDocs(dataStreamName, numDocs, 1, 1);
verifyDocs(dataStreamName, numDocs);

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

int numDocs2 = randomIntBetween(2, 16);
indexDocs(dataStreamName, numDocs2);
verifyDocs(dataStreamName, numDocs + numDocs2, 1, 2);
verifyDocs(dataStreamName, numDocs + numDocs2);

getDataStreamRequest = new GetDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { "*" });
getDataStreamResponse = client().execute(GetDataStreamAction.INSTANCE, getDataStreamRequest).actionGet();
Expand Down Expand Up @@ -959,7 +959,7 @@ public void testAliasActionsFailOnDataStreamBackingIndices() throws Exception {
);
client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).get();

String backingIndex = DataStream.getDefaultBackingIndexName(dataStreamName, 1);
String backingIndex = getDataStreamBackingIndexNames(dataStreamName).getFirst();
AliasActions addAction = new AliasActions(AliasActions.Type.ADD).index(backingIndex).aliases("first_gen");
IndicesAliasesRequest aliasesAddRequest = new IndicesAliasesRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
aliasesAddRequest.addAliasAction(addAction);
Expand Down Expand Up @@ -2050,11 +2050,8 @@ static void verifyDocs(String dataStream, long expectedNumHits, List<String> exp
});
}

static void verifyDocs(String dataStream, long expectedNumHits, long minGeneration, long maxGeneration) {
List<String> expectedIndices = new ArrayList<>();
for (long k = minGeneration; k <= maxGeneration; k++) {
expectedIndices.add(DataStream.getDefaultBackingIndexName(dataStream, k));
}
static void verifyDocs(String dataStream, long expectedNumHits) {
List<String> expectedIndices = getDataStreamBackingIndexNames(dataStream);
verifyDocs(dataStream, expectedNumHits, expectedIndices);
}

Expand Down
10 changes: 5 additions & 5 deletions ...ms/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamsSnapshotsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.metadata.DataStream;
import org.elasticsearch.cluster.metadata.DataStreamAlias;
import org.elasticsearch.cluster.metadata.DataStreamTestHelper;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.index.Index;
Expand Down Expand Up @@ -301,8 +301,8 @@ public void testSnapshotAndRestoreInPlace() {
RolloverRequest rolloverRequest = new RolloverRequest("ds", null);
RolloverResponse rolloverResponse = client.admin().indices().rolloverIndex(rolloverRequest).actionGet();
assertThat(rolloverResponse.isRolledOver(), is(true));
String backingIndexAfterSnapshot = DataStream.getDefaultBackingIndexName("ds", 2);
assertThat(rolloverResponse.getNewIndex(), equalTo(backingIndexAfterSnapshot));
String backingIndexAfterSnapshot = getDataStreamBackingIndexNames("ds").getFirst();
assertThat(rolloverResponse.getNewIndex(), DataStreamTestHelper.backingIndexEqualTo("ds", 2));

// Close all backing indices of ds data stream:
CloseIndexRequest closeIndexRequest = new CloseIndexRequest(".ds-ds-*");
Expand Down Expand Up @@ -337,7 +337,7 @@ public void testSnapshotAndRestoreInPlace() {
rolloverRequest = new RolloverRequest("ds", null);
rolloverResponse = client.admin().indices().rolloverIndex(rolloverRequest).actionGet();
assertThat(rolloverResponse.isRolledOver(), is(true));
assertThat(rolloverResponse.getNewIndex(), equalTo(DataStream.getDefaultBackingIndexName("ds", 3)));
assertThat(rolloverResponse.getNewIndex(), DataStreamTestHelper.backingIndexEqualTo("ds", 3));
}

public void testFailureStoreSnapshotAndRestore() {
Expand Down Expand Up @@ -915,7 +915,7 @@ public void testDataStreamAndBackingIndicesAreRenamedUsingRegex() {
List<GetDataStreamAction.Response.DataStreamInfo> dataStreamInfos = getDataStreamInfo("test-ds");
assertThat(
dataStreamInfos.get(0).getDataStream().getIndices().get(0).getName(),
is(DataStream.getDefaultBackingIndexName("test-ds", 1L))
DataStreamTestHelper.backingIndexEqualTo("test-ds", 1)
);

// data stream "ds" should still exist in the system
Expand Down
2 changes: 1 addition & 1 deletion test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ public static List<String> getDataStreamBackingIndexNames(String dataStreamName,
GetDataStreamAction.Response response = safeGet(
client().execute(
GetDataStreamAction.INSTANCE,
new GetDataStreamAction.Request(TEST_REQUEST_TIMEOUT, new String[] { dataStreamName })
new GetDataStreamAction.Request(SAFE_AWAIT_TIMEOUT, new String[] { dataStreamName })
Comment on lines 908 to +911
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since safeGet(...) uses SAFE_AWAIT_TIMEOUT, I changed the timeout here to avoid confusion.

)
);
assertThat(response.getDataStreams().size(), equalTo(1));
Expand Down
5 changes: 2 additions & 3 deletions ...ith-basic/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbWithBasicRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.elasticsearch.xpack.logsdb;

import org.elasticsearch.client.Request;
import org.elasticsearch.cluster.metadata.DataStream;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexSettings;
Expand Down Expand Up @@ -178,7 +177,7 @@ public void testLogsdbOverrideDefaultModeForLogsIndex() throws IOException {
""");
assertOK(client().performRequest(request));

String index = DataStream.getDefaultBackingIndexName("logs-test-foo", 1);
String index = getDataStreamBackingIndexNames("logs-test-foo").getFirst();
var settings = (Map<?, ?>) ((Map<?, ?>) getIndexSettings(index).get(index)).get("settings");
assertEquals("logsdb", settings.get("index.mode"));
assertEquals(SourceFieldMapper.Mode.STORED.toString(), settings.get("index.mapping.source.mode"));
Expand Down Expand Up @@ -231,7 +230,7 @@ public void testLogsdbRouteOnSortFields() throws IOException {
""");
assertOK(client().performRequest(request));

String index = DataStream.getDefaultBackingIndexName("my-log-foo", 1);
String index = getDataStreamBackingIndexNames("my-log-foo").getFirst();
var settings = (Map<?, ?>) ((Map<?, ?>) getIndexSettings(index).get(index)).get("settings");
assertEquals("logsdb", settings.get("index.mode"));
assertEquals(SourceFieldMapper.Mode.STORED.toString(), settings.get("index.mapping.source.mode"));
Expand Down
7 changes: 3 additions & 4 deletions x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/LogsdbRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package org.elasticsearch.xpack.logsdb;

import org.elasticsearch.client.Request;
import org.elasticsearch.cluster.metadata.DataStream;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.time.DateFormatter;
Expand Down Expand Up @@ -114,7 +113,7 @@ public void testLogsdbSourceModeForLogsIndex() throws IOException {
""");
assertOK(client().performRequest(request));

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

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

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