From 507f40cd721f89ae2774e06ad777e7d22149e701 Mon Sep 17 00:00:00 2001 From: Niels Bauman <33722607+nielsbauman@users.noreply.github.com> Date: Fri, 11 Apr 2025 17:45:45 +0200 Subject: [PATCH] Fix `ILMDownsampleDisruptionIT.testILMDownsampleRollingRestart` (#126692) Wait for the index to exist on the master node to ensure all nodes have the latest cluster state. Fixes #126495 --- muted-tests.yml | 3 --- .../org/elasticsearch/test/ESIntegTestCase.java | 16 ++++++++++------ .../downsample/ILMDownsampleDisruptionIT.java | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index c684fd33dd02..b21ed9958f95 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -396,9 +396,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 diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index 233c3fd9eabd..247b2a6047e8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -1735,17 +1735,21 @@ public abstract class ESIntegTestCase extends ESTestCase { } 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() ); } diff --git a/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java b/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java index b94ed992fe85..0739968d3f19 100644 --- a/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java +++ b/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/ILMDownsampleDisruptionIT.java @@ -192,8 +192,8 @@ public class ILMDownsampleDisruptionIT extends ESIntegTestCase { 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))