Wait for background refresh in testAutomaticRefresh (#45661)

If the background refresh is running, but not finished yet then the document might not be visible to the next search. Thus, if scheduledRefresh returns false, we need to wait until the background refresh is done. Closes #45571
elastic · Aug 20, 2019 · dc6e3e2 · dc6e3e2
1 parent d66a307
commit dc6e3e2
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java
@@ -709,10 +709,16 @@ public void testAutomaticRefresh() throws InterruptedException {
             // with ZERO we are guaranteed to see the doc since we will wait for a refresh in the background
             assertFalse(hasRefreshed);
             assertTrue(shard.isSearchIdle());
-        } else if (randomTimeValue == null){
-            // with null we are guaranteed to see the doc since do execute the refresh.
-            // we can't assert on hasRefreshed since it might have been refreshed in the background on the shard concurrently
-            assertFalse(shard.isSearchIdle());
+        } else {
+            if (randomTimeValue == null) {
+                assertFalse(shard.isSearchIdle());
+            }
+            // we can't assert on hasRefreshed since it might have been refreshed in the background on the shard concurrently.
+            // and if the background refresh wins the refresh race (both call maybeRefresh), the document might not be visible
+            // until the background refresh is done.
+            if (hasRefreshed == false) {
+                ensureNoPendingScheduledRefresh(indexService.getThreadPool());
+            }
         }
         CountDownLatch started = new CountDownLatch(1);
         Thread t = new Thread(() -> {