Change

Tim-Brooks · Jun 8, 2023 · 3d54150 · 3d54150
1 parent a7096f9
commit 3d54150
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java
@@ -152,18 +152,14 @@ public void testPendingRefreshWithIntervalChange() throws Exception {
         ensureGreen();
         client().prepareIndex("test").setId("0").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get();
         IndexShard shard = indexService.getShard(0);
-        PlainActionFuture<Boolean> future = PlainActionFuture.newFuture();
-        shard.scheduledRefresh(future);
-        assertFalse(future.actionGet());
+        scheduleRefresh(shard, false);
         assertTrue(shard.isSearchIdle());
         CountDownLatch refreshLatch = new CountDownLatch(1);
         // async on purpose to make sure it happens concurrently
         client().admin().indices().prepareRefresh().execute(ActionListener.running(refreshLatch::countDown));
         assertHitCount(client().prepareSearch().get(), 1);
         client().prepareIndex("test").setId("1").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get();
-        PlainActionFuture<Boolean> future2 = PlainActionFuture.newFuture();
-        shard.scheduledRefresh(future2);
-        assertFalse(future2.actionGet());
+        scheduleRefresh(shard, false);
         assertTrue(shard.hasRefreshPending());
 
         // now disable background refresh and make sure the refresh happens
@@ -182,9 +178,7 @@ public void testPendingRefreshWithIntervalChange() throws Exception {
         // otherwise, it will compete to call `Engine#maybeRefresh` with the `scheduledRefresh` that we are going to verify.
         ensureNoPendingScheduledRefresh(indexService.getThreadPool());
         client().prepareIndex("test").setId("2").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get();
-        PlainActionFuture<Boolean> future3 = PlainActionFuture.newFuture();
-        shard.scheduledRefresh(future3);
-        assertTrue(future3.actionGet());
+        scheduleRefresh(shard, true);
         assertFalse(shard.hasRefreshPending());
         assertTrue(shard.isSearchIdle());
         assertHitCount(client().prepareSearch().get(), 3);
@@ -196,6 +190,16 @@ public void testPendingRefreshWithIntervalChange() throws Exception {
         }
     }
 
+    private static void scheduleRefresh(IndexShard shard, boolean expectRefresh) {
+        PlainActionFuture<Boolean> future = PlainActionFuture.newFuture();
+        shard.scheduledRefresh(future);
+        if (expectRefresh) {
+            assertTrue(future.actionGet());
+        } else {
+            assertFalse(future.actionGet());
+        }
+    }
+
     private void ensureNoPendingScheduledRefresh(ThreadPool threadPool) {
         // We can make sure that all scheduled refresh tasks are done by submitting *maximumPoolSize* blocking tasks,
         // then wait until all of them completed. Note that using ThreadPoolStats is not watertight as both queue and