Skip to content

Apache Lucene open-source search software

Use CDL to block threads to avoid flaky tests. (#14116)

Ao Liee65e8f8b141
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index e6174479ee0..c569db7f7ad 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -68,8 +68,11 @@ Bug Fixes
Other
---------------------
+
* GITHUB#14081: Fix urls describing why NIOFS is not recommended for Windows (Marcel Yeonghyeon Ko)
+* GITHUB#14116 Use CDL to block threads to avoid flaky tests. (Ao Li)
+
======================= Lucene 10.1.0 =======================
API Changes
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
index e0b2c49d854..fcf42177570 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
@@ -418,7 +418,6 @@ public class TestConcurrentMergeScheduler extends LuceneTestCase {
dir.close();
}
- @SuppressForbidden(reason = "Thread sleep")
public void testIntraMergeThreadPoolIsLimitedByMaxThreads() throws IOException {
ConcurrentMergeScheduler mergeScheduler = new ConcurrentMergeScheduler();
MergeScheduler.MergeSource mergeSource =
@@ -475,11 +474,12 @@ public class TestConcurrentMergeScheduler extends LuceneTestCase {
Executor executor = mergeScheduler.intraMergeExecutor;
AtomicInteger threadsExecutedOnPool = new AtomicInteger();
AtomicInteger threadsExecutedOnSelf = new AtomicInteger();
- for (int i = 0; i < 4; i++) {
+ CountDownLatch latch = new CountDownLatch(1);
+ final int totalThreads = 4;
+ for (int i = 0; i < totalThreads; i++) {
mergeScheduler.mergeThreads.add(
mergeScheduler.new MergeThread(mergeSource, merge) {
@Override
- @SuppressForbidden(reason = "Thread sleep")
public void run() {
executor.execute(
() -> {
@@ -489,7 +489,7 @@ public class TestConcurrentMergeScheduler extends LuceneTestCase {
threadsExecutedOnPool.incrementAndGet();
}
try {
- Thread.sleep(100);
+ latch.await();
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
@@ -500,6 +500,10 @@ public class TestConcurrentMergeScheduler extends LuceneTestCase {
for (ConcurrentMergeScheduler.MergeThread thread : mergeScheduler.mergeThreads) {
thread.start();
}
+ while (threadsExecutedOnSelf.get() + threadsExecutedOnPool.get() < totalThreads) {
+ Thread.yield();
+ }
+ latch.countDown();
mergeScheduler.sync();
assertEquals(3, threadsExecutedOnSelf.get());
assertEquals(1, threadsExecutedOnPool.get());