From 125cd8b8b46c2f8b8bedf925c62ff435686acf82 Mon Sep 17 00:00:00 2001 From: Lee Hinman Date: Thu, 31 Oct 2019 13:25:27 -0600 Subject: [PATCH] Fix TimeSeriesLifecycleActionsIT.testExplainFilters This test used an index without an alias to simulate a failure in the `check-rollover-ready` step. However, with #48256 that step automatically retries, meaning that the index may not always be in the ERROR step. This commit changes the test to use a shrink action with an invalid number of shards so that it stays in the ERROR step. Resolves #48767 --- .../ilm/TimeSeriesLifecycleActionsIT.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java b/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java index 4f6c450ed99d5..344c7d69e4aae 100644 --- a/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java +++ b/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java @@ -835,6 +835,23 @@ public void testExplainFilters() throws Exception { createFullPolicy(TimeValue.ZERO); + { + // Create a "shrink-only-policy" + Map warmActions = new HashMap<>(); + warmActions.put(ShrinkAction.NAME, new ShrinkAction(17)); + Map phases = new HashMap<>(); + phases.put("warm", new Phase("warm", TimeValue.ZERO, warmActions)); + LifecyclePolicy lifecyclePolicy = new LifecyclePolicy("shrink-only-policy", phases); + // PUT policy + XContentBuilder builder = jsonBuilder(); + lifecyclePolicy.toXContent(builder, null); + final StringEntity entity = new StringEntity( + "{ \"policy\":" + Strings.toString(builder) + "}", ContentType.APPLICATION_JSON); + Request request = new Request("PUT", "_ilm/policy/shrink-only-policy"); + request.setEntity(entity); + assertOK(client().performRequest(request)); + } + createIndexWithSettings(goodIndex, Settings.builder() .put(RolloverAction.LIFECYCLE_ROLLOVER_ALIAS, "alias") .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0) @@ -842,7 +859,7 @@ public void testExplainFilters() throws Exception { ); createIndexWithSettingsNoAlias(errorIndex, Settings.builder() .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0) - .put(LifecycleSettings.LIFECYCLE_NAME, policy) + .put(LifecycleSettings.LIFECYCLE_NAME, "shrink-only-policy") ); createIndexWithSettingsNoAlias(nonexistantPolicyIndex, Settings.builder() .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0)