100_000

Author: albertzaharovits

server/src/internalClusterTest/java/org/elasticsearch/index/engine/ThreadPoolMergeSchedulerStressTestIT.java

@@ -79,14 +79,6 @@ public static class TestEnginePlugin extends Plugin implements EnginePlugin {
         final Semaphore runMergeSemaphore = new Semaphore(initialRunMergesCount);
         final int waitMergesEnqueuedCount = randomIntBetween(50, 100);
 
-        void allowAllMerging() {
-            // even when indexing is done, queued and backlogged merges can themselves trigger further merging
-            // don't let this test be bothered by that, and simply let all merging run unhindered
-            if (runMergeSemaphore.availablePermits() < 10_000) {
-                runMergeSemaphore.release(10_000);
-            }
-        }
-
         class TestInternalEngine extends org.elasticsearch.index.engine.InternalEngine {
 
             TestInternalEngine(EngineConfig engineConfig) {
@@ -267,10 +259,13 @@ public void testMergingFallsBehindAndThenCatchesUp() throws Exception {
         for (Thread indexingThread : indexingThreads) {
             indexingThread.join();
         }
+        // even when indexing is done, queued and backlogged merges can themselves trigger further merging
+        // don't let this test be bothered by that, and simply unblock all merges
+        // 100k is a fudge value, but there's no easy way to find a smartest one here
+        testEnginePlugin.runMergeSemaphore.release(100_000);
         // await all merging to catch up
         assertBusy(() -> {
-            // unblock merge threads
-            testEnginePlugin.allowAllMerging();
+            assert testEnginePlugin.runMergeSemaphore.availablePermits() > 0 : "some merges are blocked, test is broken";
             assertThat(testEnginePlugin.runningMergesSet.size(), is(0));
             assertThat(testEnginePlugin.enqueuedMergesSet.size(), is(0));
             testEnginePlugin.mergeExecutorServiceReference.get().allDone();