Increase timeout testFollowIndexWithConcurrentMappingChanges

Fixes #59273
elastic · Jul 26, 2020 · 11ddf27 · 11ddf27
1 parent 234d004
commit 11ddf27
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java b/...plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java
@@ -279,7 +279,9 @@ public void testFollowIndexWithConcurrentMappingChanges() throws Exception {
                         leaderClient().admin().indices().prepareFlush("index1").setForce(true).get();
                     }
                 }
-                leaderClient().admin().indices().prepareFlush("index1").setForce(true).setWaitIfOngoing(true).get();
+                if (between(0, 100) < 20) {
+                    leaderClient().admin().indices().prepareFlush("index1").setForce(false).setWaitIfOngoing(false).get();
+                }
             }
         });
         thread.start();
@@ -290,7 +292,7 @@ public void testFollowIndexWithConcurrentMappingChanges() throws Exception {
         ensureFollowerGreen("index2");
 
         for (int i = 0; i < firstBatchNumDocs; i++) {
-            assertBusy(assertExpectedDocumentRunnable(i));
+            assertBusy(assertExpectedDocumentRunnable(i), 1, TimeUnit.MINUTES);
         }
 
         final int secondBatchNumDocs = randomIntBetween(2, 64);
@@ -301,7 +303,7 @@ public void testFollowIndexWithConcurrentMappingChanges() throws Exception {
         }
 
         for (int i = firstBatchNumDocs; i < firstBatchNumDocs + secondBatchNumDocs; i++) {
-            assertBusy(assertExpectedDocumentRunnable(i));
+            assertBusy(assertExpectedDocumentRunnable(i), 1, TimeUnit.MINUTES);
         }
 
         isRunning.set(false);