This is an automated email from the ASF dual-hosted git repository. Caideyipi pushed a commit to branch codex/stabilize-query-cancellation-ut-20261102 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d3d726cd39bd00ad63f25b48d1b6fead83fcb96b Author: Caideyipi <[email protected]> AuthorDate: Mon Nov 2 16:04:03 2026 +0800 Propagate worker failures and guarantee unit test cleanup --- .../execution/exchange/SharedTsBlockQueueTest.java | 68 ++++++++++++---------- .../source/SeriesScanUtilCancellationTest.java | 19 ++++-- .../schedule/queue/L1PriorityQueueTest.java | 5 +- .../schedule/queue/L2PriorityQueueTest.java | 5 +- .../queue/MultilevelPriorityQueueTest.java | 5 +- 5 files changed, 61 insertions(+), 41 deletions(-) diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/exchange/SharedTsBlockQueueTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/exchange/SharedTsBlockQueueTest.java index 29fe431b327..18a3094507e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/exchange/SharedTsBlockQueueTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/exchange/SharedTsBlockQueueTest.java @@ -34,6 +34,8 @@ import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; +import java.util.concurrent.CompletionService; +import java.util.concurrent.ExecutorCompletionService; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -144,39 +146,41 @@ public class SharedTsBlockQueueTest { TsBlock block = Utils.createMockTsBlock(mockTsBlockSize); int blockCount = 1000; ExecutorService executor = Executors.newFixedThreadPool(2); + CompletionService<Void> completedTasks = new ExecutorCompletionService<>(executor); try { - Future<?> sender = - executor.submit( - () -> { - for (int i = 0; i < blockCount; i++) { - ListenableFuture<Void> blocked; - synchronized (queue) { - blocked = queue.add(block); - } - blocked.get(10, TimeUnit.SECONDS); - } - synchronized (queue) { - queue.setNoMoreTsBlocks(true); - } - return null; - }); - Future<?> receiver = - executor.submit( - () -> { - for (int i = 0; i < blockCount; i++) { - ListenableFuture<Void> blocked; - synchronized (queue) { - blocked = queue.isBlocked(); - } - blocked.get(10, TimeUnit.SECONDS); - synchronized (queue) { - Assert.assertSame(block, queue.remove()); - } - } - return null; - }); - sender.get(10, TimeUnit.SECONDS); - receiver.get(10, TimeUnit.SECONDS); + completedTasks.submit( + () -> { + for (int i = 0; i < blockCount; i++) { + ListenableFuture<Void> blocked; + synchronized (queue) { + blocked = queue.add(block); + } + blocked.get(10, TimeUnit.SECONDS); + } + synchronized (queue) { + queue.setNoMoreTsBlocks(true); + } + return null; + }); + completedTasks.submit( + () -> { + for (int i = 0; i < blockCount; i++) { + ListenableFuture<Void> blocked; + synchronized (queue) { + blocked = queue.isBlocked(); + } + blocked.get(10, TimeUnit.SECONDS); + synchronized (queue) { + Assert.assertSame(block, queue.remove()); + } + } + return null; + }); + for (int i = 0; i < 2; i++) { + Future<Void> completed = completedTasks.poll(10, TimeUnit.SECONDS); + Assert.assertNotNull(completed); + completed.get(); + } Assert.assertTrue(queue.hasNoMoreTsBlocks()); Assert.assertTrue(queue.isEmpty()); Assert.assertEquals(0, spyMemoryPool.getReservedBytes()); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanUtilCancellationTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanUtilCancellationTest.java index 62e5a26fe3a..d0bda579aca 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanUtilCancellationTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/source/SeriesScanUtilCancellationTest.java @@ -443,12 +443,19 @@ public class SeriesScanUtilCancellationTest { resumeScan.countDown(); allowNotifications.countDown(); worker.shutdownNow(); - assertTrue(worker.awaitTermination(5, TimeUnit.SECONDS)); - driver.close(); - context.decrementNumOfUnClosedDriver(); - // Let FI cleanup finish after opening its latch, without interrupting its driver-close wait. - notifications.shutdown(); - assertTrue(notifications.awaitTermination(5, TimeUnit.SECONDS)); + try { + assertTrue(worker.awaitTermination(5, TimeUnit.SECONDS)); + } finally { + try { + driver.close(); + } finally { + context.decrementNumOfUnClosedDriver(); + // Let FI cleanup finish after opening its latch, without interrupting its driver-close + // wait. + notifications.shutdown(); + assertTrue(notifications.awaitTermination(5, TimeUnit.SECONDS)); + } + } } } diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L1PriorityQueueTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L1PriorityQueueTest.java index 2b1cd8ce009..cb5abc56abb 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L1PriorityQueueTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L1PriorityQueueTest.java @@ -48,7 +48,10 @@ public class L1PriorityQueueTest { try { await() .atMost(10, TimeUnit.SECONDS) - .untilAsserted(() -> Assert.assertEquals(Thread.State.WAITING, t1.getState())); + .until(() -> result.isDone() || t1.getState() == Thread.State.WAITING); + if (result.isDone()) { + Assert.fail("poll completed before an element was pushed: " + result.get()); + } QueueElement e2 = new QueueElement(new QueueElement.QueueElementID(1), 1); queue.push(e2); Assert.assertSame(e2, result.get(10, TimeUnit.SECONDS)); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L2PriorityQueueTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L2PriorityQueueTest.java index 7809c75c288..3a9e85fcc2f 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L2PriorityQueueTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L2PriorityQueueTest.java @@ -48,7 +48,10 @@ public class L2PriorityQueueTest { try { await() .atMost(10, TimeUnit.SECONDS) - .untilAsserted(() -> Assert.assertEquals(Thread.State.WAITING, t1.getState())); + .until(() -> result.isDone() || t1.getState() == Thread.State.WAITING); + if (result.isDone()) { + Assert.fail("poll completed before an element was pushed: " + result.get()); + } QueueElement e2 = new QueueElement(new QueueElement.QueueElementID(1), 1); queue.push(e2); Assert.assertSame(e2, result.get(10, TimeUnit.SECONDS)); diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/MultilevelPriorityQueueTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/MultilevelPriorityQueueTest.java index 87f9a8db73e..7d9de811af5 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/MultilevelPriorityQueueTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/MultilevelPriorityQueueTest.java @@ -51,7 +51,10 @@ public class MultilevelPriorityQueueTest { try { await() .atMost(10, TimeUnit.SECONDS) - .untilAsserted(() -> Assert.assertEquals(Thread.State.WAITING, t1.getState())); + .until(() -> result.isDone() || t1.getState() == Thread.State.WAITING); + if (result.isDone()) { + Assert.fail("poll completed before an element was pushed: " + result.get()); + } DriverTask e2 = mockDriverTask(mockDriverTaskId(), false); queue.push(e2); Assert.assertSame(e2, result.get(10, TimeUnit.SECONDS));
