feat(wal):reduce concurrent conflicts between block write operations and poll operations AutoMQ#1550

Author: CLFutureX

s3stream/src/main/java/com/automq/stream/s3/wal/impl/block/Block.java

@@ -28,6 +28,11 @@ public interface Block {
      */
     long startOffset();
 
+    /**
+     * The start time of this block*
+     * @return
+     */
+    long startTime();
     /**
      * Append a record to this block.
      * Cannot be called after {@link #data()} is called.

s3stream/src/main/java/com/automq/stream/s3/wal/impl/block/BlockImpl.java

@@ -65,6 +65,11 @@ public long startOffset() {
         return startOffset;
     }
 
+    @Override
+    public long startTime() {
+        return this.startTime;
+    }
+
     /**
      * Note: this method is NOT thread safe.
      */
@@ -120,4 +125,9 @@ public long size() {
     public void polled() {
         StorageOperationStats.getInstance().appendWALBlockPolledStats.record(TimerUtil.durationElapsedAs(startTime, TimeUnit.NANOSECONDS));
     }
+
+    @Override
+    public boolean isEmpty() {
+        return records.isEmpty();
+    }
 }

s3stream/src/main/java/com/automq/stream/s3/wal/impl/block/SlidingWindowService.java

@@ -24,7 +24,9 @@
 import java.util.LinkedList;
 import java.util.PriorityQueue;
 import java.util.Queue;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -62,6 +64,8 @@ public class SlidingWindowService {
      * The lock of {@link #pendingBlocks}, {@link #writingBlocks}, {@link #currentBlock}.
      */
     private final Lock blockLock = new ReentrantLock();
+
+    private final Lock pollBlocKLock = new ReentrantLock();
     /**
      * Blocks that are being written.
      */
@@ -80,11 +84,11 @@ public class SlidingWindowService {
      * Blocks that are waiting to be written.
      * All blocks in this queue are ordered by the start offset.
      */
-    private Queue<Block> pendingBlocks = new LinkedList<>();
+    private BlockingQueue<Block> pendingBlocks = new LinkedBlockingQueue<>();
     /**
      * The current block, records are added to this block.
      */
-    private Block currentBlock;
+    private volatile Block currentBlock;
 
     /**
      * The thread pool for write operations.
@@ -98,7 +102,7 @@ public class SlidingWindowService {
     /**
      * The last time when a batch of blocks is written to the disk.
      */
-    private long lastWriteTimeNanos = 0;
+    private volatile long lastWriteTimeNanos = 0;
 
     public SlidingWindowService(WALChannel walChannel, int ioThreadNums, long upperLimit, long scaleUnit,
         long blockSoftLimit, int writeRateLimit, WALHeaderFlusher flusher) {
@@ -276,38 +280,43 @@ private Block nextBlock(Block previousBlock) {
      * Get all blocks to be written. If there is no non-empty block, return null.
      */
     private BlockBatch pollBlocks() {
-        blockLock.lock();
-        try {
-            return pollBlocksLocked();
-        } finally {
-            blockLock.unlock();
+        if (this.pollBlocKLock.tryLock()) {
+            try {
+                return pollBlocksLocked();
+            } finally {
+                this.pollBlocKLock.unlock();
+            }
         }
+        return null;
     }
 
     /**
      * Get all blocks to be written. If there is no non-empty block, return null.
      * Note: this method is NOT thread safe, and it should be called with {@link #blockLock} locked.
      */
     private BlockBatch pollBlocksLocked() {
-        Block currentBlock = getCurrentBlockLocked();
-
-        boolean isPendingBlockEmpty = pendingBlocks.isEmpty();
-        boolean isCurrentBlockEmpty = currentBlock == null || currentBlock.isEmpty();
-        if (isPendingBlockEmpty && isCurrentBlockEmpty) {
-            // No record to be written
-            return null;
+        Block currentBlock = this.currentBlock;
+        boolean isCurrentBlockNotEmpty = currentBlock != null && !currentBlock.isEmpty();
+        if (isCurrentBlockNotEmpty) {
+            long time = System.nanoTime();
+            if (time - currentBlock.startTime() > minWriteIntervalNanos) {
+                if (this.blockLock.tryLock()) {
+                    try {
+                        currentBlock = this.getCurrentBlockLocked();
+                        if (time - currentBlock.startTime() > minWriteIntervalNanos) {
+                            pendingBlocks.add(currentBlock);
+                            setCurrentBlockLocked(nextBlock(currentBlock));
+                        }
+                    } finally {
+                        this.blockLock.unlock();
+                    }
+                }
+            }
         }
 
-        Collection<Block> blocks;
-        if (!isPendingBlockEmpty) {
-            blocks = pendingBlocks;
-            pendingBlocks = new LinkedList<>();
-        } else {
-            blocks = new LinkedList<>();
-        }
-        if (!isCurrentBlockEmpty) {
-            blocks.add(currentBlock);
-            setCurrentBlockLocked(nextBlock(currentBlock));
+        Collection<Block> blocks = new LinkedList<>();
+        while (!pendingBlocks.isEmpty()) {
+            blocks.add(pendingBlocks.poll());
         }
 
         BlockBatch blockBatch = new BlockBatch(blocks);