X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FRaftActorRecoverySupportTest.java;h=897294718f3ab78a9ee1dda4a5594c97dbab8fdd;hp=e4f77f1c40d33687627216ed44aa3a939fd157f5;hb=dac16f0d464eff3325b3800a803e81b303964e4b;hpb=d7c18f7ec722679e4746382162efea975b6f7a97 diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java index e4f77f1c40..897294718f 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java @@ -8,20 +8,23 @@ package org.opendaylight.controller.cluster.raft; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyObject; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import akka.japi.Procedure; + import akka.persistence.RecoveryCompleted; import akka.persistence.SnapshotMetadata; import akka.persistence.SnapshotOffer; -import akka.persistence.SnapshotSelectionCriteria; +import com.google.common.collect.Sets; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import org.hamcrest.Description; import org.junit.Before; import org.junit.Test; @@ -33,12 +36,16 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.cluster.DataPersistenceProvider; import org.opendaylight.controller.cluster.PersistentDataProvider; -import org.opendaylight.controller.cluster.raft.base.messages.ApplyJournalEntries; -import org.opendaylight.controller.cluster.raft.base.messages.ApplyLogEntries; -import org.opendaylight.controller.cluster.raft.base.messages.DeleteEntries; -import org.opendaylight.controller.cluster.raft.base.messages.UpdateElectionTerm; -import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior; -import org.opendaylight.controller.cluster.raft.ServerConfigurationPayload.ServerInfo; +import org.opendaylight.controller.cluster.raft.MockRaftActor.MockSnapshotState; +import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockPayload; +import org.opendaylight.controller.cluster.raft.persisted.ApplyJournalEntries; +import org.opendaylight.controller.cluster.raft.persisted.DeleteEntries; +import org.opendaylight.controller.cluster.raft.persisted.ServerConfigurationPayload; +import org.opendaylight.controller.cluster.raft.persisted.ServerInfo; +import org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry; +import org.opendaylight.controller.cluster.raft.persisted.Snapshot; +import org.opendaylight.controller.cluster.raft.persisted.UpdateElectionTerm; +import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,12 +61,13 @@ public class RaftActorRecoverySupportTest { @Mock private DataPersistenceProvider mockPersistence; - @Mock - private RaftActorBehavior mockBehavior; @Mock private RaftActorRecoveryCohort mockCohort; + @Mock + private RaftActorSnapshotCohort mockSnapshotCohort; + @Mock PersistentDataProvider mockPersistentProvider; @@ -67,20 +75,22 @@ public class RaftActorRecoverySupportTest { private RaftActorContext context; private final DefaultConfigParamsImpl configParams = new DefaultConfigParamsImpl(); + private final String localId = "leader"; @Before public void setup() { MockitoAnnotations.initMocks(this); - context = new RaftActorContextImpl(null, null, "test", new ElectionTermImpl(mockPersistentProvider, "test", LOG), - -1, -1, Collections.emptyMap(), configParams, mockPersistence, LOG); + context = new RaftActorContextImpl(null, null, localId, new ElectionTermImpl(mockPersistentProvider, "test", + LOG), -1, -1, Collections.emptyMap(), configParams, + mockPersistence, applyState -> { }, LOG); - support = new RaftActorRecoverySupport(context, mockBehavior , mockCohort); + support = new RaftActorRecoverySupport(context, mockCohort); doReturn(true).when(mockPersistence).isRecoveryApplicable(); - context.setReplicatedLog(ReplicatedLogImpl.newInstance(context, mockBehavior)); + context.setReplicatedLog(ReplicatedLogImpl.newInstance(context)); } private void sendMessageToSupport(Object message) { @@ -94,8 +104,7 @@ public class RaftActorRecoverySupportTest { @Test public void testOnReplicatedLogEntry() { - MockRaftActorContext.MockReplicatedLogEntry logEntry = new MockRaftActorContext.MockReplicatedLogEntry(1, - 1, new MockRaftActorContext.MockPayload("1", 5)); + ReplicatedLogEntry logEntry = new SimpleReplicatedLogEntry(1, 1, new MockRaftActorContext.MockPayload("1", 5)); sendMessageToSupport(logEntry); @@ -113,18 +122,12 @@ public class RaftActorRecoverySupportTest { configParams.setJournalRecoveryLogBatchSize(5); ReplicatedLog replicatedLog = context.getReplicatedLog(); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 0, new MockRaftActorContext.MockPayload("0"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 1, new MockRaftActorContext.MockPayload("1"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 2, new MockRaftActorContext.MockPayload("2"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 3, new MockRaftActorContext.MockPayload("3"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 4, new MockRaftActorContext.MockPayload("4"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 5, new MockRaftActorContext.MockPayload("5"))); + replicatedLog.append(new SimpleReplicatedLogEntry(0, 1, new MockRaftActorContext.MockPayload("0"))); + replicatedLog.append(new SimpleReplicatedLogEntry(1, 1, new MockRaftActorContext.MockPayload("1"))); + replicatedLog.append(new SimpleReplicatedLogEntry(2, 1, new MockRaftActorContext.MockPayload("2"))); + replicatedLog.append(new SimpleReplicatedLogEntry(3, 1, new MockRaftActorContext.MockPayload("3"))); + replicatedLog.append(new SimpleReplicatedLogEntry(4, 1, new MockRaftActorContext.MockPayload("4"))); + replicatedLog.append(new SimpleReplicatedLogEntry(5, 1, new MockRaftActorContext.MockPayload("5"))); sendMessageToSupport(new ApplyJournalEntries(2)); @@ -147,7 +150,7 @@ public class RaftActorRecoverySupportTest { InOrder inOrder = Mockito.inOrder(mockCohort); inOrder.verify(mockCohort).startLogRecoveryBatch(5); - for(int i = 0; i < replicatedLog.size() - 1; i++) { + for (int i = 0; i < replicatedLog.size() - 1; i++) { inOrder.verify(mockCohort).appendRecoveredLogEntry(replicatedLog.get(i).getData()); } @@ -158,44 +161,29 @@ public class RaftActorRecoverySupportTest { inOrder.verifyNoMoreInteractions(); } - @Test - public void testOnApplyLogEntries() { - ReplicatedLog replicatedLog = context.getReplicatedLog(); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 0, new MockRaftActorContext.MockPayload("0"))); - - sendMessageToSupport(new ApplyLogEntries(0)); - - assertEquals("Last applied", 0, context.getLastApplied()); - assertEquals("Commit index", 0, context.getCommitIndex()); - } - @Test public void testOnSnapshotOffer() { ReplicatedLog replicatedLog = context.getReplicatedLog(); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 1, new MockRaftActorContext.MockPayload("1"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 2, new MockRaftActorContext.MockPayload("2"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 3, new MockRaftActorContext.MockPayload("3"))); - - byte[] snapshotBytes = {1,2,3,4,5}; + replicatedLog.append(new SimpleReplicatedLogEntry(1, 1, new MockRaftActorContext.MockPayload("1"))); + replicatedLog.append(new SimpleReplicatedLogEntry(2, 1, new MockRaftActorContext.MockPayload("2"))); + replicatedLog.append(new SimpleReplicatedLogEntry(3, 1, new MockRaftActorContext.MockPayload("3"))); - ReplicatedLogEntry unAppliedEntry1 = new MockRaftActorContext.MockReplicatedLogEntry(1, - 4, new MockRaftActorContext.MockPayload("4", 4)); + ReplicatedLogEntry unAppliedEntry1 = new SimpleReplicatedLogEntry(4, 1, + new MockRaftActorContext.MockPayload("4", 4)); - ReplicatedLogEntry unAppliedEntry2 = new MockRaftActorContext.MockReplicatedLogEntry(1, - 5, new MockRaftActorContext.MockPayload("5", 5)); + ReplicatedLogEntry unAppliedEntry2 = new SimpleReplicatedLogEntry(5, 1, + new MockRaftActorContext.MockPayload("5", 5)); long lastAppliedDuringSnapshotCapture = 3; long lastIndexDuringSnapshotCapture = 5; long electionTerm = 2; String electionVotedFor = "member-2"; - Snapshot snapshot = Snapshot.create(snapshotBytes, Arrays.asList(unAppliedEntry1, unAppliedEntry2), - lastIndexDuringSnapshotCapture, 1, lastAppliedDuringSnapshotCapture, 1, electionTerm, electionVotedFor); + MockSnapshotState snapshotState = new MockSnapshotState(Arrays.asList(new MockPayload("1"))); + Snapshot snapshot = Snapshot.create(snapshotState, + Arrays.asList(unAppliedEntry1, unAppliedEntry2), lastIndexDuringSnapshotCapture, 1, + lastAppliedDuringSnapshotCapture, 1, electionTerm, electionVotedFor, null); SnapshotMetadata metadata = new SnapshotMetadata("test", 6, 12345); SnapshotOffer snapshotOffer = new SnapshotOffer(metadata , snapshot); @@ -211,17 +199,16 @@ public class RaftActorRecoverySupportTest { assertEquals("Snapshot index", lastAppliedDuringSnapshotCapture, context.getReplicatedLog().getSnapshotIndex()); assertEquals("Election term", electionTerm, context.getTermInformation().getCurrentTerm()); assertEquals("Election votedFor", electionVotedFor, context.getTermInformation().getVotedFor()); + assertFalse("Dynamic server configuration", context.isDynamicServerConfigurationInUse()); - verify(mockCohort).applyRecoverySnapshot(snapshotBytes); + verify(mockCohort).applyRecoverySnapshot(snapshotState); } @Test public void testOnRecoveryCompletedWithRemainingBatch() { ReplicatedLog replicatedLog = context.getReplicatedLog(); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 0, new MockRaftActorContext.MockPayload("0"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 1, new MockRaftActorContext.MockPayload("1"))); + replicatedLog.append(new SimpleReplicatedLogEntry(0, 1, new MockRaftActorContext.MockPayload("0"))); + replicatedLog.append(new SimpleReplicatedLogEntry(1, 1, new MockRaftActorContext.MockPayload("1"))); sendMessageToSupport(new ApplyJournalEntries(1)); @@ -233,12 +220,12 @@ public class RaftActorRecoverySupportTest { InOrder inOrder = Mockito.inOrder(mockCohort); inOrder.verify(mockCohort).startLogRecoveryBatch(anyInt()); - for(int i = 0; i < replicatedLog.size(); i++) { + for (int i = 0; i < replicatedLog.size(); i++) { inOrder.verify(mockCohort).appendRecoveredLogEntry(replicatedLog.get(i).getData()); } inOrder.verify(mockCohort).applyCurrentLogRecoveryBatch(); - + inOrder.verify(mockCohort).getRestoreFromSnapshot(); inOrder.verifyNoMoreInteractions(); } @@ -246,34 +233,16 @@ public class RaftActorRecoverySupportTest { public void testOnRecoveryCompletedWithNoRemainingBatch() { sendMessageToSupport(RecoveryCompleted.getInstance(), true); + verify(mockCohort).getRestoreFromSnapshot(); verifyNoMoreInteractions(mockCohort); } - @Test - public void testOnDeprecatedDeleteEntries() { - ReplicatedLog replicatedLog = context.getReplicatedLog(); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 0, new MockRaftActorContext.MockPayload("0"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 1, new MockRaftActorContext.MockPayload("1"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 2, new MockRaftActorContext.MockPayload("2"))); - - sendMessageToSupport(new org.opendaylight.controller.cluster.raft.RaftActor.DeleteEntries(1)); - - assertEquals("Journal log size", 1, context.getReplicatedLog().size()); - assertEquals("Last index", 0, context.getReplicatedLog().lastIndex()); - } - @Test public void testOnDeleteEntries() { ReplicatedLog replicatedLog = context.getReplicatedLog(); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 0, new MockRaftActorContext.MockPayload("0"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 1, new MockRaftActorContext.MockPayload("1"))); - replicatedLog.append(new MockRaftActorContext.MockReplicatedLogEntry(1, - 2, new MockRaftActorContext.MockPayload("2"))); + replicatedLog.append(new SimpleReplicatedLogEntry(0, 1, new MockRaftActorContext.MockPayload("0"))); + replicatedLog.append(new SimpleReplicatedLogEntry(1, 1, new MockRaftActorContext.MockPayload("1"))); + replicatedLog.append(new SimpleReplicatedLogEntry(2, 1, new MockRaftActorContext.MockPayload("2"))); sendMessageToSupport(new DeleteEntries(1)); @@ -290,39 +259,27 @@ public class RaftActorRecoverySupportTest { assertEquals("Voted For", "member2", context.getTermInformation().getVotedFor()); } - @Test - public void testDeprecatedUpdateElectionTerm() { - - sendMessageToSupport(new org.opendaylight.controller.cluster.raft.RaftActor.UpdateElectionTerm(5, "member2")); - - assertEquals("Current term", 5, context.getTermInformation().getCurrentTerm()); - assertEquals("Voted For", "member2", context.getTermInformation().getVotedFor()); - } - - @SuppressWarnings("unchecked") @Test public void testDataRecoveredWithPersistenceDisabled() { + doNothing().when(mockCohort).applyRecoverySnapshot(anyObject()); doReturn(false).when(mockPersistence).isRecoveryApplicable(); doReturn(10L).when(mockPersistentProvider).getLastSequenceNumber(); - sendMessageToSupport(new UpdateElectionTerm(5, "member2")); - - Snapshot snapshot = Snapshot.create(new byte[]{1}, Collections.emptyList(), 3, 1, 3, 1); + Snapshot snapshot = Snapshot.create(new MockSnapshotState(Arrays.asList(new MockPayload("1"))), + Collections.emptyList(), 3, 1, 3, 1, -1, null, null); SnapshotOffer snapshotOffer = new SnapshotOffer(new SnapshotMetadata("test", 6, 12345), snapshot); sendMessageToSupport(snapshotOffer); - sendMessageToSupport(new MockRaftActorContext.MockReplicatedLogEntry(1, - 4, new MockRaftActorContext.MockPayload("4"))); - sendMessageToSupport(new MockRaftActorContext.MockReplicatedLogEntry(1, - 5, new MockRaftActorContext.MockPayload("5"))); + sendMessageToSupport(new UpdateElectionTerm(5, "member2")); + + sendMessageToSupport(new SimpleReplicatedLogEntry(4, 1, new MockRaftActorContext.MockPayload("4"))); + sendMessageToSupport(new SimpleReplicatedLogEntry(5, 1, new MockRaftActorContext.MockPayload("5"))); sendMessageToSupport(new ApplyJournalEntries(4)); sendMessageToSupport(new DeleteEntries(5)); - sendMessageToSupport(new org.opendaylight.controller.cluster.raft.RaftActor.DeleteEntries(5)); - assertEquals("Journal log size", 0, context.getReplicatedLog().size()); assertEquals("Last index", -1, context.getReplicatedLog().lastIndex()); assertEquals("Last applied", -1, context.getLastApplied()); @@ -335,11 +292,11 @@ public class RaftActorRecoverySupportTest { sendMessageToSupport(RecoveryCompleted.getInstance(), true); + verify(mockCohort, never()).applyRecoverySnapshot(anyObject()); + verify(mockCohort, never()).getRestoreFromSnapshot(); verifyNoMoreInteractions(mockCohort); verify(mockPersistentProvider).deleteMessages(10L); - verify(mockPersistentProvider).deleteSnapshots(any(SnapshotSelectionCriteria.class)); - verify(mockPersistentProvider).persist(updateElectionTerm(5, "member2"), any(Procedure.class)); } static UpdateElectionTerm updateElectionTerm(final long term, final String votedFor) { @@ -368,55 +325,91 @@ public class RaftActorRecoverySupportTest { sendMessageToSupport(RecoveryCompleted.getInstance(), true); + verify(mockCohort).getRestoreFromSnapshot(); verifyNoMoreInteractions(mockCohort, mockPersistentProvider); } @Test - public void testUpdatePeerIds() { - - String leader = "Leader"; - String follower1 = "follower1"; - String follower2 = "follower2"; - String follower3 = "follower3"; - - Map peerAddresses = new HashMap<>(); + public void testServerConfigurationPayloadApplied() { + String follower1 = "follower1"; + String follower2 = "follower2"; + String follower3 = "follower3"; + + context.addToPeers(follower1, null, VotingState.VOTING); + context.addToPeers(follower2, null, VotingState.VOTING); + + //add new Server + ServerConfigurationPayload obj = new ServerConfigurationPayload(Arrays.asList( + new ServerInfo(localId, true), + new ServerInfo(follower1, true), + new ServerInfo(follower2, false), + new ServerInfo(follower3, true))); + + sendMessageToSupport(new SimpleReplicatedLogEntry(0, 1, obj)); + + //verify new peers + assertTrue("Dynamic server configuration", context.isDynamicServerConfigurationInUse()); + assertEquals("New peer Ids", Sets.newHashSet(follower1, follower2, follower3), + Sets.newHashSet(context.getPeerIds())); + assertEquals("follower1 isVoting", true, context.getPeerInfo(follower1).isVoting()); + assertEquals("follower2 isVoting", false, context.getPeerInfo(follower2).isVoting()); + assertEquals("follower3 isVoting", true, context.getPeerInfo(follower3).isVoting()); + + sendMessageToSupport(new ApplyJournalEntries(0)); + + verify(mockCohort, never()).startLogRecoveryBatch(anyInt()); + verify(mockCohort, never()).appendRecoveredLogEntry(any(Payload.class)); + + //remove existing follower1 + obj = new ServerConfigurationPayload(Arrays.asList( + new ServerInfo(localId, true), + new ServerInfo("follower2", true), + new ServerInfo("follower3", true))); + + sendMessageToSupport(new SimpleReplicatedLogEntry(1, 1, obj)); + + //verify new peers + assertTrue("Dynamic server configuration", context.isDynamicServerConfigurationInUse()); + assertEquals("New peer Ids", Sets.newHashSet(follower2, follower3), Sets.newHashSet(context.getPeerIds())); + } - peerAddresses.put(leader, null); - peerAddresses.put(follower1, null); - peerAddresses.put(follower2, null); + @Test + public void testServerConfigurationPayloadAppliedWithPersistenceDisabled() { + doReturn(false).when(mockPersistence).isRecoveryApplicable(); - context.addToPeers(leader,null,VotingState.VOTING); - context.addToPeers(follower1,null,VotingState.VOTING); - context.addToPeers(follower2,null,VotingState.VOTING); + String follower = "follower"; + ServerConfigurationPayload obj = new ServerConfigurationPayload(Arrays.asList( + new ServerInfo(localId, true), new ServerInfo(follower, true))); - assertEquals("Size", 3, context.getPeers().size()); + sendMessageToSupport(new SimpleReplicatedLogEntry(0, 1, obj)); - //add new Server - ServerConfigurationPayload obj = new ServerConfigurationPayload(Arrays.asList( - new ServerInfo(leader, true), - new ServerInfo(follower1, true), - new ServerInfo(follower2, true), - new ServerInfo(follower3, true))); + //verify new peers + assertEquals("New peer Ids", Sets.newHashSet(follower), Sets.newHashSet(context.getPeerIds())); + } - MockRaftActorContext.MockReplicatedLogEntry logEntry = new MockRaftActorContext.MockReplicatedLogEntry(1, - 1, obj); + @Test + public void testOnSnapshotOfferWithServerConfiguration() { + long electionTerm = 2; + String electionVotedFor = "member-2"; + ServerConfigurationPayload serverPayload = new ServerConfigurationPayload(Arrays.asList( + new ServerInfo(localId, true), + new ServerInfo("follower1", true), + new ServerInfo("follower2", true))); - sendMessageToSupport(logEntry); - //verify size and names - assertEquals("Size", 4, context.getPeers().size()); - assertEquals("New follower matched", true , context.getPeerIds().contains(follower3)); + MockSnapshotState snapshotState = new MockSnapshotState(Arrays.asList(new MockPayload("1"))); + Snapshot snapshot = Snapshot.create(snapshotState, Collections.emptyList(), + -1, -1, -1, -1, electionTerm, electionVotedFor, serverPayload); - //remove existing follower1 - obj = new ServerConfigurationPayload(Arrays.asList( - new ServerInfo("Leader", true), - new ServerInfo("follower2", true), - new ServerInfo("follower3", true))); + SnapshotMetadata metadata = new SnapshotMetadata("test", 6, 12345); + SnapshotOffer snapshotOffer = new SnapshotOffer(metadata , snapshot); - logEntry = new MockRaftActorContext.MockReplicatedLogEntry(1, 1, obj); + sendMessageToSupport(snapshotOffer); - sendMessageToSupport(logEntry); - //verify size and names - assertEquals("Size", 3, context.getPeers().size()); - assertEquals("Removed follower matched", false, context.getPeerIds().contains(follower1)); + assertEquals("Journal log size", 0, context.getReplicatedLog().size()); + assertEquals("Election term", electionTerm, context.getTermInformation().getCurrentTerm()); + assertEquals("Election votedFor", electionVotedFor, context.getTermInformation().getVotedFor()); + assertTrue("Dynamic server configuration", context.isDynamicServerConfigurationInUse()); + assertEquals("Peer List", Sets.newHashSet("follower1", "follower2"), + Sets.newHashSet(context.getPeerIds())); } }