[Java] Wait for recording to stop before checking if it has been comp…

…letely replicated.
moyeanl · Aug 30, 2024 · ef8afe8 · ef8afe8
1 parent 2975d2a
commit ef8afe8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/aeron-archive/src/main/java/io/aeron/archive/ReplicationSession.java b/aeron-archive/src/main/java/io/aeron/archive/ReplicationSession.java
@@ -96,7 +96,6 @@ enum State
     private ExclusivePublication responsePublication = null;
     private ArchiveProxy responseArchiveProxy = null;
 
-
     ReplicationSession(
         final long srcRecordingId,
         final long dstRecordingId,

diff --git a/aeron-samples/src/test/java/io/aeron/samples/archive/RecordingReplicatorTest.java b/aeron-samples/src/test/java/io/aeron/samples/archive/RecordingReplicatorTest.java
@@ -65,8 +65,10 @@ class RecordingReplicatorTest
     private static final String DST_ARCHIVE_REPLICATION_CHANNEL =
         "aeron:udp?alias=dst-replication-channel|endpoint=localhost:9999";
     private static final int TERM_BUFFER_LENGTH = 128 * 1024;
+
     @RegisterExtension
     final SystemTestWatcher testWatcher = new SystemTestWatcher();
+
     private TestMediaDriver srcMediaDriver;
     private TestMediaDriver dstMediaDriver;
     private Archive srcArchive;
@@ -209,8 +211,8 @@ private long createRecording(
         try (ExclusivePublication publication = aeronArchive.addRecordedExclusivePublication(channel, streamId))
         {
             final CountersReader counters = aeronArchive.context().aeron().countersReader();
-            final int counterId =
-                Tests.awaitRecordingCounterId(counters, publication.sessionId(), aeronArchive.archiveId());
+            final int counterId = Tests.awaitRecordingCounterId(
+                counters, publication.sessionId(), aeronArchive.archiveId());
             final long recordingId = RecordingPos.getRecordingId(counters, counterId);
             final BufferClaim bufferClaim = new BufferClaim();
 
@@ -263,6 +265,11 @@ private void verifyRecordingReplicated(final long srcRecordingId, final long dst
         assertEquals(1, srcAeronArchive.listRecording(srcRecordingId, collector.reset()));
         final RecordingDescriptor srcRecording = collector.descriptors().get(0).retain();
 
+        while (dstAeronArchive.getStopPosition(dstRecordingId) == AeronArchive.NULL_POSITION)
+        {
+            Tests.yield();
+        }
+
         assertEquals(1, dstAeronArchive.listRecording(dstRecordingId, collector.reset()));
         final RecordingDescriptor dstRecording = collector.descriptors().get(0).retain();