Skip to content

Fix flaky CompactionWorkerTest by replacing fixed sleep with CountDownLatch #18498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackieTien97 merged 1 commit into from
Aug 20, 2026
+52 −6
Merged

Fix flaky CompactionWorkerTest by replacing fixed sleep with CountDownLatch #18498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 52 additions & 6 deletions ...st/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionWorkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,15 @@ public void testFailedToAllocateMemoryInCrossTask() throws Exception {
0);
CrossSpaceCompactionTask taskMock = Mockito.spy(task);
Mockito.doReturn(true).when(taskMock).start();
CountDownLatch statusResetLatch = new CountDownLatch(1);
Mockito.doAnswer(
invocation -> {
invocation.callRealMethod();
statusResetLatch.countDown();
return null;
})
.when(taskMock)
.resetCompactionCandidateStatusForAllSourceFiles();
FixedPriorityBlockingQueue<AbstractCompactionTask> queue =
new CompactionTaskQueue(50, new DefaultCompactionTaskComparatorImpl());
queue.put(taskMock);
Expand All @@ -108,7 +117,9 @@ public void testFailedToAllocateMemoryInCrossTask() throws Exception {
}
});
thread.start();
thread.join(TimeUnit.SECONDS.toMillis(2));
Assert.assertTrue(
"source files should be reset to NORMAL after the cross-space task is dropped",
statusResetLatch.await(5, TimeUnit.SECONDS));
Assert.assertEquals(
0, SystemInfo.getInstance().getCompactionMemoryBlock().getUsedMemoryInBytes());
Assert.assertEquals(0, SystemInfo.getInstance().getCompactionFileNumCost().get());
Expand Down Expand Up @@ -153,6 +164,15 @@ public void testFailedToAllocateFileNumInCrossTask() throws InterruptedException
0L, tsFileManager, sequenceFiles, unsequenceFiles, null, 1000, 0);
CrossSpaceCompactionTask taskMock = Mockito.spy(task);
Mockito.doReturn(true).when(taskMock).start();
CountDownLatch statusResetLatch = new CountDownLatch(1);
Mockito.doAnswer(
invocation -> {
invocation.callRealMethod();
statusResetLatch.countDown();
return null;
})
.when(taskMock)
.resetCompactionCandidateStatusForAllSourceFiles();
FixedPriorityBlockingQueue<AbstractCompactionTask> queue =
new CompactionTaskQueue(50, new DefaultCompactionTaskComparatorImpl());
queue.put(taskMock);
Expand All @@ -165,7 +185,9 @@ public void testFailedToAllocateFileNumInCrossTask() throws InterruptedException
}
});
thread.start();
thread.join(TimeUnit.SECONDS.toMillis(2));
Assert.assertTrue(
"source files should be reset to NORMAL after the cross-space task is dropped",
statusResetLatch.await(5, TimeUnit.SECONDS));
Assert.assertEquals(
0, SystemInfo.getInstance().getCompactionMemoryBlock().getUsedMemoryInBytes());
Assert.assertEquals(0, SystemInfo.getInstance().getCompactionFileNumCost().get());
Expand Down Expand Up @@ -208,9 +230,19 @@ public void testFailedToCheckValidInCrossTask() throws InterruptedException {
CrossSpaceCompactionTask task =
new CrossSpaceCompactionTask(
0L, tsFileManager, sequenceFiles, unsequenceFiles, null, 1000, 0);
CrossSpaceCompactionTask taskMock = Mockito.spy(task);
CountDownLatch statusResetLatch = new CountDownLatch(1);
Mockito.doAnswer(
invocation -> {
invocation.callRealMethod();
statusResetLatch.countDown();
return null;
})
.when(taskMock)
.resetCompactionCandidateStatusForAllSourceFiles();
FixedPriorityBlockingQueue<AbstractCompactionTask> queue =
new CompactionTaskQueue(50, new DefaultCompactionTaskComparatorImpl());
queue.put(task);
queue.put(taskMock);
Thread thread =
new Thread(
() -> {
Expand All @@ -220,7 +252,9 @@ public void testFailedToCheckValidInCrossTask() throws InterruptedException {
}
});
thread.start();
thread.join(TimeUnit.SECONDS.toMillis(2));
Assert.assertTrue(
"source files should be reset to NORMAL after the cross-space task is dropped",
statusResetLatch.await(5, TimeUnit.SECONDS));
Assert.assertEquals(
0, SystemInfo.getInstance().getCompactionMemoryBlock().getUsedMemoryInBytes());
Assert.assertEquals(0, SystemInfo.getInstance().getCompactionFileNumCost().get());
Expand Down Expand Up @@ -248,9 +282,19 @@ public void testFailedToCheckValidInInnerTask() throws InterruptedException {
// fail to check valid when tsfile manager is not allowed to compaction in inner task
InnerSpaceCompactionTask innerTask =
new InnerSpaceCompactionTask(0L, tsFileManager, sequenceFiles, true, null, 0L);
InnerSpaceCompactionTask innerTaskMock = Mockito.spy(innerTask);
CountDownLatch statusResetLatch = new CountDownLatch(1);
Mockito.doAnswer(
invocation -> {
invocation.callRealMethod();
statusResetLatch.countDown();
return null;
})
.when(innerTaskMock)
.resetCompactionCandidateStatusForAllSourceFiles();
FixedPriorityBlockingQueue<AbstractCompactionTask> queue =
new CompactionTaskQueue(50, new DefaultCompactionTaskComparatorImpl());
queue.put(innerTask);
queue.put(innerTaskMock);
Thread thread =
new Thread(
() -> {
Expand All @@ -260,7 +304,9 @@ public void testFailedToCheckValidInInnerTask() throws InterruptedException {
}
});
thread.start();
thread.join(TimeUnit.SECONDS.toMillis(2));
Assert.assertTrue(
"source files should be reset to NORMAL after the inner-space task is dropped",
statusResetLatch.await(5, TimeUnit.SECONDS));
Assert.assertEquals(
0, SystemInfo.getInstance().getCompactionMemoryBlock().getUsedMemoryInBytes());
Assert.assertEquals(0, SystemInfo.getInstance().getCompactionFileNumCost().get());
Expand Down
Loading