Skip to content

Commit 6d14e63

Browse files
authored
Fix TimeSeriesDataStreamsIT.testShrinkActionInPolicyWithoutHotPhase (#123153) (#123739)
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 (cherry picked from commit 4b31293)
1 parent 3b53702 commit 6d14e63

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/TimeSeriesRestDriver.java

+3
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,9 @@ public static String waitAndGetShrinkIndexName(RestClient client, String origina
457457
"GET",
458458
SHRUNKEN_INDEX_PREFIX + "*" + originalIndex + "," + originalIndex + "/_ilm/explain"
459459
);
460+
// Sometimes, the original index might already have been deleted, so we need to ignore unavailable (concrete) indices.
461+
explainRequest.addParameter("ignore_unavailable", Boolean.toString(true));
462+
explainRequest.addParameter("expand_wildcards", "open,hidden");
460463
explainRequest.addParameter("only_errors", Boolean.toString(false));
461464
explainRequest.addParameter("only_managed", Boolean.toString(false));
462465
Response response = client.performRequest(explainRequest);

x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/TimeSeriesDataStreamsIT.java

-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ public void testRolloverIsSkippedOnManualDataStreamRollover() throws Exception {
119119
);
120120
}
121121

122-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/70595")
123122
public void testShrinkActionInPolicyWithoutHotPhase() throws Exception {
124123
createNewSingletonPolicy(client(), policyName, "warm", new ShrinkAction(1, null, false));
125124
createComposableTemplate(client(), template, dataStream + "*", getTemplate(policyName));

0 commit comments

Comments
 (0)