From 2deacead6a2f6e826f5d848a25e2c3d8a61b41ec Mon Sep 17 00:00:00 2001 From: Niels Bauman Date: Fri, 21 Feb 2025 15:54:10 +0100 Subject: [PATCH 1/2] Remove `@AwaitsFix` from `testShrinkActionInPolicyWithoutHotPhase` This test was muted, got fixed, and then was muted again but the issue wasn't reopened (by accident it seems). Since that was 4 years ago, I'm going to unmute this test and if it's still an issue, the new test automation will open a new issue for it using the current muting mechanism. Relates #70595 --- .../org/elasticsearch/xpack/ilm/TimeSeriesDataStreamsIT.java | 1 - 1 file changed, 1 deletion(-) diff --git a/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/TimeSeriesDataStreamsIT.java b/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/TimeSeriesDataStreamsIT.java index 91afa4da560b5..ac40ff9a5446f 100644 --- a/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/TimeSeriesDataStreamsIT.java +++ b/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/TimeSeriesDataStreamsIT.java @@ -123,7 +123,6 @@ public void testRolloverIsSkippedOnManualDataStreamRollover() throws Exception { ); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/70595") public void testShrinkActionInPolicyWithoutHotPhase() throws Exception { createNewSingletonPolicy(client(), policyName, "warm", new ShrinkAction(1, null, false)); createComposableTemplate(client(), template, dataStream + "*", getTemplate(policyName)); From 0f3c45001d16f48dfda4f694bdc24a4342e0c58a Mon Sep 17 00:00:00 2001 From: Niels Bauman Date: Thu, 27 Feb 2025 13:12:51 +0100 Subject: [PATCH 2/2] Fix test --- .../java/org/elasticsearch/xpack/TimeSeriesRestDriver.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/TimeSeriesRestDriver.java b/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/TimeSeriesRestDriver.java index a1c7ebc2d8b2c..11edfff9ee108 100644 --- a/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/TimeSeriesRestDriver.java +++ b/x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/TimeSeriesRestDriver.java @@ -455,6 +455,9 @@ public static String waitAndGetShrinkIndexName(RestClient client, String origina "GET", SHRUNKEN_INDEX_PREFIX + "*" + originalIndex + "," + originalIndex + "/_ilm/explain" ); + // Sometimes, the original index might already have been deleted, so we need to ignore unavailable (concrete) indices. + explainRequest.addParameter("ignore_unavailable", Boolean.toString(true)); + explainRequest.addParameter("expand_wildcards", "open,hidden"); explainRequest.addParameter("only_errors", Boolean.toString(false)); explainRequest.addParameter("only_managed", Boolean.toString(false)); Response response = client.performRequest(explainRequest);