Skip to content

Commit bf42540

Browse files
committed
Remove usages of DataStream#getDefaultBackingIndexName from elasticsearch.x-pack.plugin.ilm.qa.multi-node.internalClusterTest
1 parent 9544204 commit bf42540

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequestBuilder;
5050
import org.elasticsearch.action.bulk.BulkRequestBuilder;
5151
import org.elasticsearch.action.bulk.BulkResponse;
52+
import org.elasticsearch.action.datastreams.GetDataStreamAction;
5253
import org.elasticsearch.action.index.IndexRequestBuilder;
5354
import org.elasticsearch.action.ingest.DeletePipelineRequest;
5455
import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
@@ -81,6 +82,7 @@
8182
import org.elasticsearch.cluster.InternalClusterInfoService;
8283
import org.elasticsearch.cluster.coordination.ElasticsearchNodeCommand;
8384
import org.elasticsearch.cluster.health.ClusterHealthStatus;
85+
import org.elasticsearch.cluster.metadata.DataStream;
8486
import org.elasticsearch.cluster.metadata.IndexMetadata;
8587
import org.elasticsearch.cluster.metadata.Metadata;
8688
import org.elasticsearch.cluster.metadata.ProjectMetadata;
@@ -850,6 +852,19 @@ private static Settings.Builder getExcludeSettings(int num, Settings.Builder bui
850852
return builder;
851853
}
852854

855+
public List<String> getDataStreamBackingIndexNames(String dataStreamName) {
856+
GetDataStreamAction.Response response = safeGet(
857+
client().execute(
858+
GetDataStreamAction.INSTANCE,
859+
new GetDataStreamAction.Request(TimeValue.THIRTY_SECONDS, new String[] { dataStreamName })
860+
)
861+
);
862+
assertThat(response.getDataStreams().size(), equalTo(1));
863+
DataStream dataStream = response.getDataStreams().getFirst().getDataStream();
864+
assertThat(dataStream.getName(), equalTo(dataStreamName));
865+
return dataStream.getIndices().stream().map(Index::getName).toList();
866+
}
867+
853868
/**
854869
* Waits until all nodes have no pending tasks.
855870
*/

x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction;
1111
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
12-
import org.elasticsearch.cluster.metadata.DataStream;
1312
import org.elasticsearch.cluster.metadata.IndexMetadata;
1413
import org.elasticsearch.cluster.metadata.Template;
1514
import org.elasticsearch.common.Strings;
@@ -41,6 +40,7 @@
4140

4241
import static org.elasticsearch.xpack.core.ilm.ShrinkIndexNameSupplier.SHRUNKEN_INDEX_PREFIX;
4342
import static org.hamcrest.Matchers.equalTo;
43+
import static org.hamcrest.Matchers.notNullValue;
4444

4545
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0)
4646
public class ILMMultiNodeIT extends ESIntegTestCase {
@@ -105,7 +105,8 @@ public void testShrinkOnTiers() throws Exception {
105105
).get();
106106
logger.info("--> explain: {}", Strings.toString(explain));
107107

108-
String backingIndexName = DataStream.getDefaultBackingIndexName(index, 1);
108+
String backingIndexName = getDataStreamBackingIndexNames(index).getFirst();
109+
assertThat(backingIndexName, notNullValue());
109110
IndexLifecycleExplainResponse indexResp = null;
110111
for (Map.Entry<String, IndexLifecycleExplainResponse> indexNameAndResp : explain.getIndexResponses().entrySet()) {
111112
if (indexNameAndResp.getKey().startsWith(SHRUNKEN_INDEX_PREFIX) && indexNameAndResp.getKey().contains(backingIndexName)) {

x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeWithCCRDisabledIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction;
1111
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
12-
import org.elasticsearch.cluster.metadata.DataStream;
1312
import org.elasticsearch.cluster.metadata.IndexMetadata;
1413
import org.elasticsearch.cluster.metadata.Template;
1514
import org.elasticsearch.common.Strings;
@@ -42,6 +41,7 @@
4241

4342
import static org.elasticsearch.xpack.core.ilm.ShrinkIndexNameSupplier.SHRUNKEN_INDEX_PREFIX;
4443
import static org.hamcrest.Matchers.equalTo;
44+
import static org.hamcrest.Matchers.notNullValue;
4545

4646
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0)
4747
public class ILMMultiNodeWithCCRDisabledIT extends ESIntegTestCase {
@@ -105,7 +105,8 @@ public void testShrinkOnTiers() throws Exception {
105105
).get();
106106
logger.info("--> explain: {}", Strings.toString(explain));
107107

108-
String backingIndexName = DataStream.getDefaultBackingIndexName(index, 1);
108+
String backingIndexName = getDataStreamBackingIndexNames(index).getFirst();
109+
assertThat(backingIndexName, notNullValue());
109110
IndexLifecycleExplainResponse indexResp = null;
110111
for (Map.Entry<String, IndexLifecycleExplainResponse> indexNameAndResp : explain.getIndexResponses().entrySet()) {
111112
if (indexNameAndResp.getKey().startsWith(SHRUNKEN_INDEX_PREFIX) && indexNameAndResp.getKey().contains(backingIndexName)) {

0 commit comments

Comments
 (0)