From 75a222ffd227bb9f2aeef8ee7998f8df6f529bf8 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Mon, 5 Jun 2017 14:56:45 -0400 Subject: [PATCH] Fix RecoveryIntegrationSingleNodeTest failure The InMemoryJournal may not have received all the persisted messages by the time it checks the expected size of the journal so added a latch/wait for he expected messages.. Change-Id: I8f050b9375f5e3e74749c17e831add21d09d1831 Signed-off-by: Tom Pantelis --- .../cluster/raft/RecoveryIntegrationSingleNodeTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RecoveryIntegrationSingleNodeTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RecoveryIntegrationSingleNodeTest.java index 2a3a6c1a7a..35c051234b 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RecoveryIntegrationSingleNodeTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RecoveryIntegrationSingleNodeTest.java @@ -50,6 +50,7 @@ public class RecoveryIntegrationSingleNodeTest extends AbstractRaftActorIntegrat ActorRef singleNodeCollectorActor = singleNodeActorRef.underlyingActor().collectorActor(); final RaftActorContext singleNodeContext = singleNodeActorRef.underlyingActor().getRaftActorContext(); + InMemoryJournal.addWriteMessagesCompleteLatch(persistenceId, 6, ApplyJournalEntries.class); final MockRaftActorContext.MockPayload payload0 = sendPayloadData(singleNodeActorRef, "zero"); final MockRaftActorContext.MockPayload payload1 = sendPayloadData(singleNodeActorRef, "one"); @@ -77,6 +78,8 @@ public class RecoveryIntegrationSingleNodeTest extends AbstractRaftActorIntegrat assertEquals("Incorrect State after snapshot success is received ", Lists.newArrayList(payload0, payload1, payload2, payload3, payload4, payload5), singleNodeActorRef.underlyingActor().getState()); + InMemoryJournal.waitForWriteMessagesComplete(persistenceId); + // we get 2 log entries (4 and 5 indexes) and 3 ApplyJournalEntries (for 3, 4, and 5 indexes) assertEquals(5, InMemoryJournal.get(persistenceId).size()); -- 2.36.6