Skip to content

Commit c43805e

Browse files
Fix testMergeSourceWithFollowUpMergesRunSequentially (#126050)
Fixes #125639 Relates #120869
1 parent a255537 commit c43805e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeSchedulerTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,13 @@ public void testMergeSourceWithFollowUpMergesRunSequentially() throws Exception
390390
}).when(mergeSource).merge(any(OneMerge.class));
391391
// trigger run merges on the merge source
392392
threadPoolMergeScheduler.merge(mergeSource, randomFrom(MergeTrigger.values()));
393-
do {
393+
boolean done = false;
394+
while (done == false) {
394395
// let merges run, but wait for the in-progress one to signal it is running
395396
nextMergeSemaphore.acquire();
397+
done = runMergeIdx.get() >= followUpMergeCount;
396398
runMergeSemaphore.release();
397-
} while (runMergeIdx.get() < followUpMergeCount);
399+
}
398400
assertBusy(() -> assertTrue(threadPoolMergeExecutorService.allDone()));
399401
}
400402
}

0 commit comments

Comments
 (0)