X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FRaftActorTest.java;h=8ec50754e8ec35a83d27255936178d66462e2db4;hb=b8da9f6fa8bf4284805349f4638ebdadf169ff5f;hp=cdb3e05329bfa7b62f00c4b9aea0f25c99b066cc;hpb=225ff4000ac10d6dbdc2301d8d2165d282721413;p=controller.git

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java
index cdb3e05329..8ec50754e8 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java
@@ -885,7 +885,7 @@ public class RaftActorTest extends AbstractActorTest {
 
         // Persist another entry (this will cause a CaptureSnapshot to be triggered
         leaderActor.persistData(mockActorRef, new MockIdentifier("x"),
-                new MockRaftActorContext.MockPayload("duh"));
+                new MockRaftActorContext.MockPayload("duh"), false);
 
         // Now send a CaptureSnapshotReply
         mockActorRef.tell(new CaptureSnapshotReply(fromObject("foo").toByteArray()), mockActorRef);
@@ -1294,7 +1294,8 @@ public class RaftActorTest extends AbstractActorTest {
         Leader leader = new Leader(leaderActor.getRaftActorContext());
         leaderActor.setCurrentBehavior(leader);
 
-        leaderActor.persistData(leaderActorRef, new MockIdentifier("1"), new MockRaftActorContext.MockPayload("1"));
+        leaderActor.persistData(leaderActorRef, new MockIdentifier("1"), new MockRaftActorContext.MockPayload("1"),
+                false);
 
         ReplicatedLogEntry logEntry = leaderActor.getReplicatedLog().get(0);
         assertNotNull("ReplicatedLogEntry not found", logEntry);
@@ -1312,4 +1313,42 @@ public class RaftActorTest extends AbstractActorTest {
         assertEquals("getCommitIndex", 0, leaderActor.getRaftActorContext().getCommitIndex());
         assertEquals("getLastApplied", 0, leaderActor.getRaftActorContext().getLastApplied());
     }
+
+    @Test
+    public void testReplicateWithBatchHint() throws Exception {
+        final String leaderId = factory.generateActorId("leader-");
+        final String followerId = factory.generateActorId("follower-");
+
+        final ActorRef followerActor = factory.createActor(Props.create(MessageCollectorActor.class));
+
+        DefaultConfigParamsImpl config = new DefaultConfigParamsImpl();
+        config.setHeartBeatInterval(new FiniteDuration(1, TimeUnit.DAYS));
+        config.setIsolatedLeaderCheckInterval(new FiniteDuration(1, TimeUnit.DAYS));
+
+        TestActorRef<MockRaftActor> leaderActorRef = factory.createTestActor(
+                MockRaftActor.props(leaderId, ImmutableMap.of(followerId, followerActor.path().toString()), config),
+                    leaderId);
+        MockRaftActor leaderActor = leaderActorRef.underlyingActor();
+        leaderActor.waitForInitializeBehaviorComplete();
+
+        leaderActor.getRaftActorContext().getTermInformation().update(1, leaderId);
+
+        Leader leader = new Leader(leaderActor.getRaftActorContext());
+        leaderActor.setCurrentBehavior(leader);
+
+        MessageCollectorActor.expectFirstMatching(followerActor, AppendEntries.class);
+        MessageCollectorActor.clearMessages(followerActor);
+
+        leaderActor.onReceiveCommand(new AppendEntriesReply(followerId, 1, true, -1, -1, (short)0));
+
+        leaderActor.persistData(leaderActorRef, new MockIdentifier("1"), new MockPayload("1"), true);
+        MessageCollectorActor.assertNoneMatching(followerActor, AppendEntries.class, 500);
+
+        leaderActor.persistData(leaderActorRef, new MockIdentifier("2"), new MockPayload("2"), true);
+        MessageCollectorActor.assertNoneMatching(followerActor, AppendEntries.class, 500);
+
+        leaderActor.persistData(leaderActorRef, new MockIdentifier("3"), new MockPayload("3"), false);
+        AppendEntries appendEntries = MessageCollectorActor.expectFirstMatching(followerActor, AppendEntries.class);
+        assertEquals("AppendEntries size", 3, appendEntries.getEntries().size());
+    }
 }