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%2Fbehaviors%2FFollowerTest.java;h=a51134676a16ff81477eae2a5f092b54f684ff8b;hb=534bf6f83465cc8a575b097c1e28fbb1f34d110a;hp=c4d97ea0e56a4f6259e7cb48f2f5eac1577795de;hpb=e9fc7e7ed2b13d274518d6a872ab67749ef4507a;p=controller.git diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerTest.java index c4d97ea0e5..a51134676a 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.raft.behaviors; import static org.junit.Assert.assertEquals; @@ -14,28 +13,29 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import akka.actor.ActorRef; import akka.dispatch.Dispatchers; +import akka.protobuf.ByteString; import akka.testkit.TestActorRef; import akka.testkit.javadsl.TestKit; -import com.google.common.base.Optional; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteSource; import com.google.common.util.concurrent.Uninterruptibles; -import com.google.protobuf.ByteString; import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import org.junit.After; @@ -46,9 +46,13 @@ import org.opendaylight.controller.cluster.raft.MockRaftActor; import org.opendaylight.controller.cluster.raft.MockRaftActor.Builder; import org.opendaylight.controller.cluster.raft.MockRaftActor.MockSnapshotState; import org.opendaylight.controller.cluster.raft.MockRaftActorContext; +import org.opendaylight.controller.cluster.raft.NoopPeerAddressResolver; +import org.opendaylight.controller.cluster.raft.PeerAddressResolver; import org.opendaylight.controller.cluster.raft.RaftActorContext; import org.opendaylight.controller.cluster.raft.RaftActorSnapshotCohort; +import org.opendaylight.controller.cluster.raft.RaftVersions; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; +import org.opendaylight.controller.cluster.raft.VotingState; import org.opendaylight.controller.cluster.raft.base.messages.ApplySnapshot; import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshotReply; import org.opendaylight.controller.cluster.raft.base.messages.ElectionTimeout; @@ -111,6 +115,8 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { protected MockRaftActorContext createActorContext(final ActorRef actorRef) { MockRaftActorContext context = new MockRaftActorContext("follower", getSystem(), actorRef); context.setPayloadVersion(payloadVersion); + ((DefaultConfigParamsImpl)context.getConfigParams()).setPeerAddressResolver( + peerId -> leaderActor.path().toString()); return context; } @@ -259,7 +265,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { @Test public void testHandleFirstAppendEntriesWithPrevIndexMinusOneAndReplicatedToAllIndexPresentInLog() { - logStart("testHandleFirstAppendEntries"); + logStart("testHandleFirstAppendEntriesWithPrevIndexMinusOneAndReplicatedToAllIndexPresentInLog"); MockRaftActorContext context = createActorContext(); context.getReplicatedLog().clear(0,2); @@ -285,7 +291,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { @Test public void testHandleFirstAppendEntriesWithPrevIndexMinusOneAndReplicatedToAllIndexPresentInSnapshot() { - logStart("testHandleFirstAppendEntries"); + logStart("testHandleFirstAppendEntriesWithPrevIndexMinusOneAndReplicatedToAllIndexPresentInSnapshot"); MockRaftActorContext context = createActorContext(); context.getReplicatedLog().clear(0,2); @@ -511,7 +517,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { } /** - * This test verifies that when an AppendEntries is received a specific prevLogTerm + * This test verifies that when an AppendEntries is received with a prevLogTerm * which does not match the term that is in RaftActors log entry at prevLogIndex * then the RaftActor does not change it's state and it returns a failure. */ @@ -521,13 +527,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { MockRaftActorContext context = createActorContext(); - // First set the receivers term to lower number - context.getTermInformation().update(95, "test"); - - // AppendEntries is now sent with a bigger term - // this will set the receivers term to be the same as the sender's term - AppendEntries appendEntries = new AppendEntries(100, "leader", 0, 0, Collections.emptyList(), 101, -1, - (short)0); + AppendEntries appendEntries = new AppendEntries(2, "leader", 0, 2, Collections.emptyList(), 101, -1, (short)0); follower = createBehavior(context); @@ -541,6 +541,28 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { assertEquals("isSuccess", false, reply.isSuccess()); } + @Test + public void testHandleAppendEntriesSenderPrevLogIndexIsInTheSnapshot() { + logStart("testHandleAppendEntriesSenderPrevLogIndexIsInTheSnapshot"); + + MockRaftActorContext context = createActorContext(); + context.setReplicatedLog(new MockRaftActorContext.MockReplicatedLogBuilder().createEntries(5, 8, 3).build()); + context.getReplicatedLog().setSnapshotIndex(4); + context.getReplicatedLog().setSnapshotTerm(3); + + AppendEntries appendEntries = new AppendEntries(3, "leader", 1, 3, Collections.emptyList(), 8, -1, (short)0); + + follower = createBehavior(context); + + RaftActorBehavior newBehavior = follower.handleMessage(leaderActor, appendEntries); + + Assert.assertSame(follower, newBehavior); + + AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); + + assertEquals("isSuccess", true, reply.isSuccess()); + } + /** * This test verifies that when a new AppendEntries message is received with * new entries and the logs of the sender and receiver match that the new @@ -788,7 +810,6 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { expectAndVerifyAppendEntriesReply(1, true, context.getId(), 1, 4); } - /** * This test verifies that when InstallSnapshot is received by * the follower its applied correctly. @@ -1285,13 +1306,42 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { MockRaftActor.fromState(snapshot.getState())); } + @Test + public void testNeedsLeaderAddress() { + logStart("testNeedsLeaderAddress"); + + MockRaftActorContext context = createActorContext(); + context.setReplicatedLog(new MockRaftActorContext.SimpleReplicatedLog()); + context.addToPeers("leader", null, VotingState.VOTING); + ((DefaultConfigParamsImpl)context.getConfigParams()).setPeerAddressResolver(NoopPeerAddressResolver.INSTANCE); + + follower = createBehavior(context); + + follower.handleMessage(leaderActor, + new AppendEntries(1, "leader", -1, -1, Collections.emptyList(), -1, -1, (short)0)); + + AppendEntriesReply reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); + assertTrue(reply.isNeedsLeaderAddress()); + MessageCollectorActor.clearMessages(leaderActor); + + PeerAddressResolver mockResolver = mock(PeerAddressResolver.class); + ((DefaultConfigParamsImpl)context.getConfigParams()).setPeerAddressResolver(mockResolver); + + follower.handleMessage(leaderActor, new AppendEntries(1, "leader", -1, -1, Collections.emptyList(), -1, -1, + (short)0, RaftVersions.CURRENT_VERSION, leaderActor.path().toString())); + + reply = MessageCollectorActor.expectFirstMatching(leaderActor, AppendEntriesReply.class); + assertFalse(reply.isNeedsLeaderAddress()); + + verify(mockResolver).setResolved("leader", leaderActor.path().toString()); + } + @SuppressWarnings("checkstyle:IllegalCatch") private static RaftActorSnapshotCohort newRaftActorSnapshotCohort( final AtomicReference followerRaftActor) { RaftActorSnapshotCohort snapshotCohort = new RaftActorSnapshotCohort() { @Override - public void createSnapshot(final ActorRef actorRef, - final java.util.Optional installSnapshotStream) { + public void createSnapshot(final ActorRef actorRef, final Optional installSnapshotStream) { try { actorRef.tell(new CaptureSnapshotReply(new MockSnapshotState(followerRaftActor.get().getState()), installSnapshotStream), actorRef); @@ -1350,6 +1400,7 @@ public class FollowerTest extends AbstractRaftActorBehaviorTest { assertEquals("getLogLastIndex", expLogLastIndex, reply.getLogLastIndex()); assertEquals("getPayloadVersion", payloadVersion, reply.getPayloadVersion()); assertEquals("isForceInstallSnapshot", expForceInstallSnapshot, reply.isForceInstallSnapshot()); + assertEquals("isNeedsLeaderAddress", false, reply.isNeedsLeaderAddress()); }