This is an automated email from the ASF dual-hosted git repository.

Caideyipi pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/dev/1.3 by this push:
     new ba13298d59e [To dev/1.3] Fix WAL roll file test flush wait (#19149)
ba13298d59e is described below

commit ba13298d59ece98887b4b195c05884d0cd10e046
Author: Caideyipi <[email protected]>
AuthorDate: Fri Nov 6 17:00:35 2026 +0800

    [To dev/1.3] Fix WAL roll file test flush wait (#19149)
    
    * Fix WAL roll file test flush wait (#17904)
    
    (cherry picked from commit ad94d2b68cd3cc2ef4d23df18aebe600a1caad24)
    
    * Update WALNodeWaitForRollFileTest.java
---
 .../wal/node/WALNodeWaitForRollFileTest.java       | 61 ++++++++++++----------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeWaitForRollFileTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeWaitForRollFileTest.java
index eec2e33e81c..3e2e1e76d48 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeWaitForRollFileTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeWaitForRollFileTest.java
@@ -31,6 +31,8 @@ import org.apache.iotdb.db.storageengine.StorageEngine;
 import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable;
 import org.apache.iotdb.db.storageengine.dataregion.memtable.PrimitiveMemTable;
 import org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALMode;
+import 
org.apache.iotdb.db.storageengine.dataregion.wal.utils.listener.AbstractResultListener.Status;
+import 
org.apache.iotdb.db.storageengine.dataregion.wal.utils.listener.WALFlushListener;
 import org.apache.iotdb.db.utils.EnvironmentUtils;
 import org.apache.iotdb.db.utils.constant.TestConstant;
 
@@ -40,7 +42,6 @@ import org.apache.tsfile.file.metadata.enums.TSEncoding;
 import org.apache.tsfile.utils.Binary;
 import org.apache.tsfile.utils.BitMap;
 import org.apache.tsfile.write.schema.MeasurementSchema;
-import org.awaitility.Awaitility;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,6 +54,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -122,9 +124,8 @@ public class WALNodeWaitForRollFileTest {
     // write a small amount of data (not enough to trigger roll)
     InsertTabletNode insertTabletNode = getInsertTabletNode(devicePath, new 
long[] {1});
     insertTabletNode.setSearchIndex(1);
-    walNode.log(memTable.getMemTableId(), insertTabletNode, 0, 
insertTabletNode.getRowCount());
-
-    Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> 
walNode.isAllWALEntriesConsumed());
+    waitForFlush(
+        walNode.log(memTable.getMemTableId(), insertTabletNode, 0, 
insertTabletNode.getRowCount()));
 
     // data is flushed to buffer but no WAL file roll happened yet, iterator 
at search index 1
     // should not find data (because the current-writing WAL file is not 
readable by the iterator)
@@ -155,14 +156,13 @@ public class WALNodeWaitForRollFileTest {
     for (int i = 1; i <= 5; i++) {
       InsertTabletNode insertTabletNode = getInsertTabletNode(devicePath, new 
long[] {i});
       insertTabletNode.setSearchIndex(i);
-      walNode.log(memTable.getMemTableId(), insertTabletNode, 0, 
insertTabletNode.getRowCount());
+      waitForFlush(
+          walNode.log(
+              memTable.getMemTableId(), insertTabletNode, 0, 
insertTabletNode.getRowCount()));
     }
 
-    Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> 
walNode.isAllWALEntriesConsumed());
-
     // roll the WAL file so the data is in a closed file readable by the 
iterator
     walNode.rollWALFile();
-    Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> 
walNode.isAllWALEntriesConsumed());
 
     // iterator at search index 1 should find the data after roll
     ConsensusReqReader.ReqIterator iterator = walNode.getReqIterator(1);
@@ -182,11 +182,12 @@ public class WALNodeWaitForRollFileTest {
     // write data with search index
     InsertTabletNode insertTabletNode = getInsertTabletNode(devicePath, new 
long[] {1});
     insertTabletNode.setSearchIndex(1);
-    walNode.log(memTable.getMemTableId(), insertTabletNode, 0, 
insertTabletNode.getRowCount());
-    walNode.log(
-        memTable.getMemTableId(), new 
ContinuousSameSearchIndexSeparatorNode(new PlanNodeId("")));
-
-    Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> 
walNode.isAllWALEntriesConsumed());
+    waitForFlush(
+        walNode.log(memTable.getMemTableId(), insertTabletNode, 0, 
insertTabletNode.getRowCount()));
+    waitForFlush(
+        walNode.log(
+            memTable.getMemTableId(),
+            new ContinuousSameSearchIndexSeparatorNode(new PlanNodeId(""))));
 
     ConsensusReqReader.ReqIterator iterator = walNode.getReqIterator(1);
 
@@ -206,9 +207,6 @@ public class WALNodeWaitForRollFileTest {
 
       // trigger WAL file roll — this should signal rollLogWriterCondition and 
wake up the iterator
       walNode.rollWALFile();
-      Awaitility.await()
-          .atMost(10, TimeUnit.SECONDS)
-          .until(() -> walNode.isAllWALEntriesConsumed());
 
       assertTrue(
           "Iterator should have found data after WAL file roll",
@@ -237,11 +235,7 @@ public class WALNodeWaitForRollFileTest {
       // write initial data with search index
       InsertTabletNode first = getInsertTabletNode(devicePath, new long[] {1});
       first.setSearchIndex(1);
-      walNode.log(memTable.getMemTableId(), first, 0, first.getRowCount());
-
-      Awaitility.await()
-          .atMost(10, TimeUnit.SECONDS)
-          .until(() -> walNode.isAllWALEntriesConsumed());
+      waitForFlush(walNode.log(memTable.getMemTableId(), first, 0, 
first.getRowCount()));
 
       ConsensusReqReader.ReqIterator iterator = walNode.getReqIterator(1);
 
@@ -256,11 +250,13 @@ public class WALNodeWaitForRollFileTest {
       assertTrue(waiterStarted.await(10, TimeUnit.SECONDS));
 
       // write more data to exceed the small threshold and trigger auto-roll
+      WALFlushListener lastFlushListener = null;
       for (int i = 2; i <= 50; i++) {
         InsertTabletNode node = getInsertTabletNode(devicePath, new long[] 
{i});
         node.setSearchIndex(i);
-        walNode.log(memTable.getMemTableId(), node, 0, node.getRowCount());
+        lastFlushListener = walNode.log(memTable.getMemTableId(), node, 0, 
node.getRowCount());
       }
+      waitForFlush(lastFlushListener);
 
       assertTrue(
           "Iterator should have found data after auto WAL file roll",
@@ -288,11 +284,12 @@ public class WALNodeWaitForRollFileTest {
     // write data with search index — stays in the current (active) WAL file
     InsertTabletNode insertTabletNode = getInsertTabletNode(devicePath, new 
long[] {1});
     insertTabletNode.setSearchIndex(1);
-    walNode.log(memTable.getMemTableId(), insertTabletNode, 0, 
insertTabletNode.getRowCount());
-    walNode.log(
-        memTable.getMemTableId(), new 
ContinuousSameSearchIndexSeparatorNode(new PlanNodeId("")));
-
-    Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> 
walNode.isAllWALEntriesConsumed());
+    waitForFlush(
+        walNode.log(memTable.getMemTableId(), insertTabletNode, 0, 
insertTabletNode.getRowCount()));
+    waitForFlush(
+        walNode.log(
+            memTable.getMemTableId(),
+            new ContinuousSameSearchIndexSeparatorNode(new PlanNodeId(""))));
 
     // iterator cannot read the active WAL file, so hasNext() should be false
     ConsensusReqReader.ReqIterator iterator = walNode.getReqIterator(1);
@@ -334,6 +331,16 @@ public class WALNodeWaitForRollFileTest {
     assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
   }
 
+  private void waitForFlush(WALFlushListener flushListener) throws Exception {
+    ExecutorService executor = Executors.newSingleThreadExecutor();
+    try {
+      Future<Status> waitFuture = 
executor.submit(flushListener::waitForResult);
+      assertEquals(Status.SUCCESS, waitFuture.get(10, TimeUnit.SECONDS));
+    } finally {
+      executor.shutdownNow();
+    }
+  }
+
   private InsertTabletNode getInsertTabletNode(String devicePath, long[] times)
       throws IllegalPathException {
     String[] measurements = new String[] {"s1", "s2", "s3", "s4", "s5", "s6"};

Reply via email to