update ILM integ test cluster poll interval to 1s (#35113)

elastic · Nov 1, 2018 · f8e23f6 · f8e23f6
1 parent 5f4b23f
commit f8e23f6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/x-pack/plugin/ilm/qa/multi-node/build.gradle b/x-pack/plugin/ilm/qa/multi-node/build.gradle
@@ -15,6 +15,6 @@ integTestCluster {
     setting 'xpack.monitoring.enabled', 'false'
     setting 'xpack.ml.enabled', 'false'
     setting 'xpack.license.self_generated.type', 'trial'
-    setting 'indices.lifecycle.poll_interval', '2500ms'
+    setting 'indices.lifecycle.poll_interval', '1000ms'
 
 }
diff --git a/...de/src/test/java/org/elasticsearch/xpack/indexlifecycle/TimeSeriesLifecycleActionsIT.java b/...de/src/test/java/org/elasticsearch/xpack/indexlifecycle/TimeSeriesLifecycleActionsIT.java
@@ -82,9 +82,19 @@ public void testFullPolicy() throws Exception {
         updatePolicy(originalIndex, policy);
         // index document {"foo": "bar"} to trigger rollover
         index(client(), originalIndex, "_id", "foo", "bar");
+
+        /*
+         * These asserts are in the order that they should be satisfied in, in
+         * order to maximize the time for all operations to complete.
+         * An "out of order" assert here may result in this test occasionally
+         * timing out and failing inappropriately.
+         */
+        // asserts that rollover was called
         assertBusy(() -> assertTrue(indexExists(secondIndex)));
-        assertBusy(() -> assertFalse(indexExists(shrunkenOriginalIndex)));
+        // asserts that shrink deleted the original index
         assertBusy(() -> assertFalse(indexExists(originalIndex)));
+        // asserts that the delete phase completed for the managed shrunken index
+        assertBusy(() -> assertFalse(indexExists(shrunkenOriginalIndex)));
     }
 
     public void testMoveToAllocateStep() throws Exception {
@@ -150,9 +160,19 @@ public void testMoveToRolloverStep() throws Exception {
             "  }\n" +
             "}");
         client().performRequest(moveToStepRequest);
+
+        /*
+         * These asserts are in the order that they should be satisfied in, in
+         * order to maximize the time for all operations to complete.
+         * An "out of order" assert here may result in this test occasionally
+         * timing out and failing inappropriately.
+         */
+        // asserts that rollover was called
         assertBusy(() -> assertTrue(indexExists(secondIndex)));
-        assertBusy(() -> assertFalse(indexExists(shrunkenOriginalIndex)));
+        // asserts that shrink deleted the original index
         assertBusy(() -> assertFalse(indexExists(originalIndex)));
+        // asserts that the delete phase completed for the managed shrunken index
+        assertBusy(() -> assertFalse(indexExists(shrunkenOriginalIndex)));
     }
 
     public void testRolloverAction() throws Exception {