CAMEL-23899: Fix flaky test LogWriterRollOverUpdateAsyncWithContentionTest

components/camel-wal/src/test/java/org/apache/camel/component/wal/LogWriterRollOverUpdateAsyncBase.java

@@ -22,7 +22,7 @@
 import java.nio.ByteBuffer;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -34,12 +34,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 abstract class LogWriterRollOverUpdateAsyncBase extends LogTestBase {
     private static final Logger LOG = LoggerFactory.getLogger(LogWriterRollOverUpdateAsyncBase.class);
     protected BlockingQueue<EntryInfo.CachedEntryInfo> entryInfos;
-    protected CountDownLatch latch = new CountDownLatch(1);
     LogWriter logWriter;
     File reportFile;
 
@@ -84,7 +84,24 @@ protected void runTest(int queueCapacity) throws IOException, InterruptedExcepti
 
         final Future<?> updateTask = executorService.submit(this::markRecordsAsCommitted);
 
-        Assertions.assertTrue(latch.await(1, TimeUnit.MINUTES), "Failed to generate records within 1 minute");
+        executorService.shutdown();
+
+        // Wait for both tasks to complete using Awaitility instead of only
+        // waiting for the generate task via a latch, which left a race window
+        // where the update task could still be running when verification began.
+        await().atMost(2, TimeUnit.MINUTES)
+                .until(executorService::isTerminated);
+
+        // Propagate any exceptions from the tasks
+        try {
+            generateTask.get();
+            updateTask.get();
+        } catch (ExecutionException e) {
+            Assertions.fail("Task failed: " + e.getCause().getMessage(), e.getCause());
+        }
+
+        // Flush to ensure all data is persisted to disk before verification
+        logWriter.flush();
 
         try (LogReader reader = new LogReader(reportFile, (int) RECORD_COUNT * 100)) {
 

components/camel-wal/src/test/java/org/apache/camel/component/wal/LogWriterRollOverUpdateAsyncTest.java

@@ -38,8 +38,6 @@ protected void asyncGenerate() {
         } catch (IOException e) {
             LOG.error("Failed to generate records: {}", e.getMessage(), e);
             throw new RuntimeException(e);
-        } finally {
-            latch.countDown();
         }
     }
 

components/camel-wal/src/test/java/org/apache/camel/component/wal/LogWriterRollOverUpdateAsyncWithContentionTest.java

@@ -44,8 +44,6 @@ protected void asyncGenerate() {
         } catch (IOException e) {
             LOG.error("Failed to generate records: {}", e.getMessage(), e);
             throw new RuntimeException(e);
-        } finally {
-            latch.countDown();
         }
     }