Skip to content

Clean up SearchableSnapshotActionIT #134305

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

Merged
merged 3 commits into from
Sep 8, 2025
Merged

Clean up SearchableSnapshotActionIT #134305

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12c421a
Clean up `SearchableSnapshotActionIT`
nielsbauman Sep 6, 2025
11211ba
Spotless
nielsbauman Sep 8, 2025
22fc476
Merge branch 'main' into searchable-snapshot-test-cleanup
nielsbauman Sep 8, 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
49 changes: 21 additions & 28 deletions ...ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/TimeSeriesRestDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.util.concurrent.TimeUnit;

import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS;
import static org.elasticsearch.test.ESTestCase.assertThat;
import static org.elasticsearch.test.ESTestCase.randomAlphaOfLengthBetween;
import static org.elasticsearch.test.ESTestCase.randomBoolean;
import static org.elasticsearch.test.ESTestCase.waitUntil;
Expand All @@ -59,8 +60,6 @@
import static org.elasticsearch.xpack.core.ilm.ShrinkIndexNameSupplier.SHRUNKEN_INDEX_PREFIX;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;

/**
* This class provides the operational REST functions needed to control an ILM time series lifecycle.
Expand All @@ -80,7 +79,7 @@ public static Step.StepKey getStepKeyForIndex(RestClient client, String indexNam
return getStepKey(indexResponse);
}

private static Step.StepKey getStepKey(Map<String, Object> explainIndexResponse) {
public static Step.StepKey getStepKey(Map<String, Object> explainIndexResponse) {
String phase = (String) explainIndexResponse.get("phase");
String action = (String) explainIndexResponse.get("action");
String step = (String) explainIndexResponse.get("step");
Expand All @@ -105,14 +104,26 @@ public static Map<String, Map<String, Object>> explain(RestClient client, String
explainRequest.addParameter("only_managed", Boolean.toString(onlyManaged));
explainRequest.setOptions(consumeWarningsOptions);
Response response = client.performRequest(explainRequest);
Map<String, Object> responseMap;
try (InputStream is = response.getEntity().getContent()) {
responseMap = XContentHelper.convertToMap(XContentType.JSON.xContent(), is, true);
}
ObjectPath objectPath = ObjectPath.createFromResponse(response);
return objectPath.evaluate("indices");
}

@SuppressWarnings("unchecked")
Map<String, Map<String, Object>> indexResponse = ((Map<String, Map<String, Object>>) responseMap.get("indices"));
return indexResponse;
/**
* Waits until the specified index is at the specified ILM step. If any of phase, action, or step is null, that part is ignored.
*/
public static void awaitStepKey(RestClient client, String indexName, String phase, String action, String step) throws Exception {
ESRestTestCase.assertBusy(() -> {
final Step.StepKey stepKey = getStepKeyForIndex(client, indexName);
if (phase != null) {
assertThat(stepKey.phase(), equalTo(phase));
}
if (action != null) {
assertThat(stepKey.action(), equalTo(action));
}
if (step != null) {
assertThat(stepKey.name(), equalTo(step));
}
});
}

public static void indexDocument(RestClient client, String indexAbstractionName) throws IOException {
Expand Down Expand Up @@ -501,24 +512,6 @@ public static String waitAndGetShrinkIndexName(RestClient client, String origina
return shrunkenIndexName[0];
}

@SuppressWarnings("unchecked")
public static List<String> getBackingIndices(RestClient client, String dataStreamName) throws IOException {
Response getDataStream = client.performRequest(new Request("GET", "_data_stream/" + dataStreamName));
Map<String, Object> responseMap;
try (InputStream is = getDataStream.getEntity().getContent()) {
responseMap = XContentHelper.convertToMap(XContentType.JSON.xContent(), is, true);
}

List<Map<String, Object>> dataStreams = (List<Map<String, Object>>) responseMap.get("data_streams");
assertThat(dataStreams.size(), is(1));
Map<String, Object> dataStream = dataStreams.get(0);
assertThat(dataStream.get("name"), is(dataStreamName));
List<String> indices = ((List<Map<String, Object>>) dataStream.get("indices")).stream()
.map(indexMap -> (String) indexMap.get("index_name"))
.toList();
return indices;
}

private static void executeDummyClusterStateUpdate(RestClient client) throws IOException {
createIndexWithSettings(
client,
Expand Down
Loading