Skip to content

Fix ILMDownsampleDisruptionIT.testILMDownsampleRollingRestart #126692

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 2 commits into from
Apr 11, 2025
Merged

Fix ILMDownsampleDisruptionIT.testILMDownsampleRollingRestart #126692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbd31ab
Fix `ILMDownsampleDisruptionIT.testILMDownsampleRollingRestart`
nielsbauman Apr 11, 2025
a58467b
[CI] Auto commit changes from spotless
Apr 11, 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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,9 +399,6 @@ tests:
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
method: test {p0=transform/transforms_start_stop/Test start/stop only starts/stops specified transform}
issue: https://github.com/elastic/elasticsearch/issues/126466
- class: org.elasticsearch.xpack.downsample.ILMDownsampleDisruptionIT
method: testILMDownsampleRollingRestart
issue: https://github.com/elastic/elasticsearch/issues/126495
- class: org.elasticsearch.smoketest.MlWithSecurityIT
method: test {yaml=ml/get_trained_model_stats/Test get stats given trained models}
issue: https://github.com/elastic/elasticsearch/issues/126510
Expand Down
16 changes: 10 additions & 6 deletions 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 @@ -1735,17 +1735,21 @@ public static boolean indexExists(String index, Client client) {
}

public static void awaitIndexExists(String index) {
awaitIndexExists(index, client());
awaitIndexExists(index, client(), SAFE_AWAIT_TIMEOUT);
}

public static void awaitIndexExists(String index, TimeValue timeout) {
awaitIndexExists(index, client(), timeout);
}

public static void awaitIndexExists(String index, Client client) {
awaitIndexExists(index, client, SAFE_AWAIT_TIMEOUT);
}

public static void awaitIndexExists(String index, Client client, TimeValue timeout) {
assertThat("wildcards not supported", index, allOf(not(Metadata.ALL), not(containsString("*"))));
safeGet(
client.admin()
.cluster()
.prepareHealth(SAFE_AWAIT_TIMEOUT, index)
.setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED)
.execute()
client.admin().cluster().prepareHealth(timeout, index).setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED).execute()
);
}

Expand Down
2 changes: 1 addition & 1 deletion ...nternalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ private void startDownsampleTaskViaIlm(String sourceIndex, String targetIndex) t
throw new AssertionError(e);
}
}, 1, TimeUnit.MINUTES);
awaitIndexExists(targetIndex, TimeValue.timeValueSeconds(60));
assertBusy(() -> {
assertTrue("target index [" + targetIndex + "] does not exist", indexExists(targetIndex));
var getSettingsResponse = client().admin()
.indices()
.getSettings(new GetSettingsRequest(TEST_REQUEST_TIMEOUT).indices(targetIndex))
Expand Down