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%2FSnapshotManagerTest.java;h=0dc33130dae32b491b7acaacf42042fc36ce7b49;hp=c619917fd4f61dba44d54a6746c256ae23a1d5ef;hb=2fd1fa721510a30f58b3bc277deb05fce58badd6;hpb=59918fc863252de0e51e5167f0cb57f697b76c13 diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java index c619917fd4..0dc33130da 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java @@ -12,8 +12,9 @@ import static org.junit.Assert.assertArrayEquals; 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.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -21,10 +22,13 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; + import akka.actor.ActorRef; import akka.persistence.SnapshotSelectionCriteria; -import akka.testkit.TestActorRef; +import java.io.OutputStream; import java.util.Arrays; +import java.util.Optional; +import java.util.function.Consumer; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -32,11 +36,15 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opendaylight.controller.cluster.DataPersistenceProvider; +import org.opendaylight.controller.cluster.io.FileBackedOutputStreamFactory; import org.opendaylight.controller.cluster.raft.SnapshotManager.LastAppliedTermInformationReader; import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshot; import org.opendaylight.controller.cluster.raft.base.messages.SendInstallSnapshot; import org.opendaylight.controller.cluster.raft.base.messages.SnapshotComplete; import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior; +import org.opendaylight.controller.cluster.raft.persisted.ByteState; +import org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry; +import org.opendaylight.controller.cluster.raft.persisted.Snapshot; import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor; import org.slf4j.LoggerFactory; @@ -58,7 +66,7 @@ public class SnapshotManagerTest extends AbstractActorTest { private RaftActorBehavior mockRaftActorBehavior; @Mock - private Runnable mockProcedure; + private Consumer> mockProcedure; @Mock private ElectionTerm mockElectionTerm; @@ -67,10 +75,10 @@ public class SnapshotManagerTest extends AbstractActorTest { private TestActorFactory factory; - private TestActorRef actorRef; + private ActorRef actorRef; @Before - public void setUp(){ + public void setUp() { MockitoAnnotations.initMocks(this); doReturn(false).when(mockRaftActorContext).hasFollowers(); @@ -87,35 +95,41 @@ public class SnapshotManagerTest extends AbstractActorTest { doReturn(5L).when(mockElectionTerm).getCurrentTerm(); doReturn("member5").when(mockElectionTerm).getVotedFor(); + doReturn(new FileBackedOutputStreamFactory(10000000, "target")) + .when(mockRaftActorContext).getFileBackedOutputStreamFactory(); + snapshotManager = new SnapshotManager(mockRaftActorContext, LoggerFactory.getLogger(this.getClass())); factory = new TestActorFactory(getSystem()); - actorRef = factory.createTestActor(MessageCollectorActor.props(), factory.generateActorId("test-")); + actorRef = factory.createActor(MessageCollectorActor.props(), factory.generateActorId("test-")); doReturn(actorRef).when(mockRaftActorContext).getActor(); - snapshotManager.setCreateSnapshotRunnable(mockProcedure); + snapshotManager.setCreateSnapshotConsumer(mockProcedure); } @After - public void tearDown(){ + public void tearDown() { factory.close(); } @Test - public void testConstruction(){ + public void testConstruction() { assertEquals(false, snapshotManager.isCapturing()); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void testCaptureToInstall() throws Exception { + public void testCaptureToInstall() { // Force capturing toInstall = true - snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(1, 0, + snapshotManager.captureToInstall(new SimpleReplicatedLogEntry(0, 1, new MockRaftActorContext.MockPayload()), 0, "follower-1"); assertEquals(true, snapshotManager.isCapturing()); - verify(mockProcedure).run(); + ArgumentCaptor outputStream = ArgumentCaptor.forClass(Optional.class); + verify(mockProcedure).accept(outputStream.capture()); + assertEquals("isPresent", true, outputStream.getValue().isPresent()); CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot(); @@ -130,19 +144,22 @@ public class SnapshotManagerTest extends AbstractActorTest { // assertEquals(-1L, captureSnapshot.getReplicatedToAllIndex()); assertEquals(-1L, captureSnapshot.getReplicatedToAllTerm()); - actorRef.underlyingActor().clear(); + MessageCollectorActor.clearMessages(actorRef); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void testCapture() throws Exception { - boolean capture = snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(1,9, + public void testCapture() { + boolean capture = snapshotManager.capture(new SimpleReplicatedLogEntry(9, 1, new MockRaftActorContext.MockPayload()), 9); assertTrue(capture); assertEquals(true, snapshotManager.isCapturing()); - verify(mockProcedure).run(); + ArgumentCaptor outputStream = ArgumentCaptor.forClass(Optional.class); + verify(mockProcedure).accept(outputStream.capture()); + assertEquals("isPresent", false, outputStream.getValue().isPresent()); CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot(); @@ -158,24 +175,24 @@ public class SnapshotManagerTest extends AbstractActorTest { assertEquals(-1L, captureSnapshot.getReplicatedToAllIndex()); assertEquals(-1L, captureSnapshot.getReplicatedToAllTerm()); - actorRef.underlyingActor().clear(); - + MessageCollectorActor.clearMessages(actorRef); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void testCaptureWithNullLastLogEntry() throws Exception { + public void testCaptureWithNullLastLogEntry() { boolean capture = snapshotManager.capture(null, 1); assertTrue(capture); assertEquals(true, snapshotManager.isCapturing()); - verify(mockProcedure).run(); + ArgumentCaptor outputStream = ArgumentCaptor.forClass(Optional.class); + verify(mockProcedure).accept(outputStream.capture()); + assertEquals("isPresent", false, outputStream.getValue().isPresent()); CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot(); - System.out.println(captureSnapshot); - // LastIndex and LastTerm are picked up from the lastLogEntry assertEquals(-1L, captureSnapshot.getLastIndex()); assertEquals(-1L, captureSnapshot.getLastTerm()); @@ -187,46 +204,46 @@ public class SnapshotManagerTest extends AbstractActorTest { // assertEquals(-1L, captureSnapshot.getReplicatedToAllIndex()); assertEquals(-1L, captureSnapshot.getReplicatedToAllTerm()); - actorRef.underlyingActor().clear(); - + MessageCollectorActor.clearMessages(actorRef); } @Test - public void testCaptureWithCreateProcedureError () throws Exception { - doThrow(new RuntimeException("mock")).when(mockProcedure).run(); + public void testCaptureWithCreateProcedureError() { + doThrow(new RuntimeException("mock")).when(mockProcedure).accept(any()); - boolean capture = snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(1,9, + boolean capture = snapshotManager.capture(new SimpleReplicatedLogEntry(9, 1, new MockRaftActorContext.MockPayload()), 9); assertFalse(capture); assertEquals(false, snapshotManager.isCapturing()); - verify(mockProcedure).run(); + verify(mockProcedure).accept(any()); } + @SuppressWarnings("unchecked") @Test - public void testIllegalCapture() throws Exception { - boolean capture = snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(1,9, + public void testIllegalCapture() { + boolean capture = snapshotManager.capture(new SimpleReplicatedLogEntry(9, 1, new MockRaftActorContext.MockPayload()), 9); assertTrue(capture); - verify(mockProcedure).run(); + verify(mockProcedure).accept(any()); reset(mockProcedure); // This will not cause snapshot capture to start again - capture = snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(1,9, + capture = snapshotManager.capture(new SimpleReplicatedLogEntry(9, 1, new MockRaftActorContext.MockPayload()), 9); assertFalse(capture); - verify(mockProcedure, never()).run(); + verify(mockProcedure, never()).accept(any()); } @Test - public void testPersistWhenReplicatedToAllIndexMinusOne(){ + public void testPersistWhenReplicatedToAllIndexMinusOne() { doReturn(7L).when(mockReplicatedLog).getSnapshotIndex(); doReturn(1L).when(mockReplicatedLog).getSnapshotTerm(); @@ -234,11 +251,10 @@ public class SnapshotManagerTest extends AbstractActorTest { doReturn(8L).when(mockRaftActorContext).getLastApplied(); - MockRaftActorContext.MockReplicatedLogEntry lastLogEntry = new MockRaftActorContext.MockReplicatedLogEntry( - 3L, 9L, new MockRaftActorContext.MockPayload()); + ReplicatedLogEntry lastLogEntry = new SimpleReplicatedLogEntry(9L, 3L, new MockRaftActorContext.MockPayload()); - MockRaftActorContext.MockReplicatedLogEntry lastAppliedEntry = new MockRaftActorContext.MockReplicatedLogEntry( - 2L, 8L, new MockRaftActorContext.MockPayload()); + ReplicatedLogEntry lastAppliedEntry = new SimpleReplicatedLogEntry( + 8L, 2L, new MockRaftActorContext.MockPayload()); doReturn(lastAppliedEntry).when(mockReplicatedLog).get(8L); doReturn(Arrays.asList(lastLogEntry)).when(mockReplicatedLog).getFrom(9L); @@ -246,8 +262,8 @@ public class SnapshotManagerTest extends AbstractActorTest { // when replicatedToAllIndex = -1 snapshotManager.capture(lastLogEntry, -1); - byte[] bytes = new byte[] {1,2,3,4,5,6,7,8,9,10}; - snapshotManager.persist(bytes, Runtime.getRuntime().totalMemory()); + ByteState snapshotState = ByteState.of(new byte[] {1,2,3,4,5,6,7,8,9,10}); + snapshotManager.persist(snapshotState, Optional.empty(), Runtime.getRuntime().totalMemory()); ArgumentCaptor snapshotArgumentCaptor = ArgumentCaptor.forClass(Snapshot.class); verify(mockDataPersistenceProvider).saveSnapshot(snapshotArgumentCaptor.capture()); @@ -258,7 +274,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertEquals("getLastIndex", 9L, snapshot.getLastIndex()); assertEquals("getLastAppliedTerm", 2L, snapshot.getLastAppliedTerm()); assertEquals("getLastAppliedIndex", 8L, snapshot.getLastAppliedIndex()); - assertArrayEquals("getState", bytes, snapshot.getState()); + assertEquals("getState", snapshotState, snapshot.getState()); assertEquals("getUnAppliedEntries", Arrays.asList(lastLogEntry), snapshot.getUnAppliedEntries()); assertEquals("electionTerm", mockElectionTerm.getCurrentTerm(), snapshot.getElectionTerm()); assertEquals("electionVotedFor", mockElectionTerm.getVotedFor(), snapshot.getElectionVotedFor()); @@ -267,7 +283,7 @@ public class SnapshotManagerTest extends AbstractActorTest { } @Test - public void testPersistWhenReplicatedToAllIndexNotMinus(){ + public void testPersistWhenReplicatedToAllIndexNotMinus() { doReturn(45L).when(mockReplicatedLog).getSnapshotIndex(); doReturn(6L).when(mockReplicatedLog).getSnapshotTerm(); ReplicatedLogEntry replicatedLogEntry = mock(ReplicatedLogEntry.class); @@ -276,11 +292,10 @@ public class SnapshotManagerTest extends AbstractActorTest { doReturn(9L).when(replicatedLogEntry).getIndex(); // when replicatedToAllIndex != -1 - snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(6,9, - new MockRaftActorContext.MockPayload()), 9); + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), 9); - byte[] bytes = new byte[] {1,2,3,4,5,6,7,8,9,10}; - snapshotManager.persist(bytes, Runtime.getRuntime().totalMemory()); + ByteState snapshotState = ByteState.of(new byte[] {1,2,3,4,5,6,7,8,9,10}); + snapshotManager.persist(snapshotState, Optional.empty(), Runtime.getRuntime().totalMemory()); ArgumentCaptor snapshotArgumentCaptor = ArgumentCaptor.forClass(Snapshot.class); verify(mockDataPersistenceProvider).saveSnapshot(snapshotArgumentCaptor.capture()); @@ -291,7 +306,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertEquals("getLastIndex", 9L, snapshot.getLastIndex()); assertEquals("getLastAppliedTerm", 6L, snapshot.getLastAppliedTerm()); assertEquals("getLastAppliedIndex", 9L, snapshot.getLastAppliedIndex()); - assertArrayEquals("getState", bytes, snapshot.getState()); + assertEquals("getState", snapshotState, snapshot.getState()); assertEquals("getUnAppliedEntries size", 0, snapshot.getUnAppliedEntries().size()); verify(mockReplicatedLog).snapshotPreCommit(9L, 6L); @@ -300,14 +315,13 @@ public class SnapshotManagerTest extends AbstractActorTest { } @Test - public void testPersistWhenReplicatedLogDataSizeGreaterThanThreshold(){ + public void testPersistWhenReplicatedLogDataSizeGreaterThanThreshold() { doReturn(Integer.MAX_VALUE).when(mockReplicatedLog).dataSize(); // when replicatedToAllIndex = -1 - snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(6,9, - new MockRaftActorContext.MockPayload()), -1); + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), -1); - snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory()); + snapshotManager.persist(ByteState.empty(), Optional.empty(), Runtime.getRuntime().totalMemory()); verify(mockDataPersistenceProvider).saveSnapshot(any(Snapshot.class)); @@ -330,10 +344,10 @@ public class SnapshotManagerTest extends AbstractActorTest { doReturn(6L).when(replicatedLogEntry).getTerm(); doReturn(replicatedToAllIndex).when(replicatedLogEntry).getIndex(); - snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(6, 9, + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), replicatedToAllIndex); - snapshotManager.persist(new byte[]{}, 2000000L); + snapshotManager.persist(ByteState.empty(), Optional.empty(), 2000000L); verify(mockDataPersistenceProvider).saveSnapshot(any(Snapshot.class)); @@ -342,19 +356,29 @@ public class SnapshotManagerTest extends AbstractActorTest { verify(mockRaftActorBehavior).setReplicatedToAllIndex(replicatedToAllIndex); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void testPersistSendInstallSnapshot(){ + public void testPersistSendInstallSnapshot() throws Exception { doReturn(Integer.MAX_VALUE).when(mockReplicatedLog).dataSize(); + doNothing().when(mockProcedure).accept(any()); // when replicatedToAllIndex = -1 - boolean capture = snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9, + boolean capture = snapshotManager.captureToInstall(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), -1, "follower-1"); assertTrue(capture); - byte[] bytes = new byte[] {1,2,3,4,5,6,7,8,9,10}; + ByteState snapshotState = ByteState.of(new byte[] {1,2,3,4,5,6,7,8,9,10}); + + ArgumentCaptor installSnapshotStreamCapture = ArgumentCaptor.forClass(Optional.class); + verify(mockProcedure).accept(installSnapshotStreamCapture.capture()); + + Optional installSnapshotStream = installSnapshotStreamCapture.getValue(); + assertEquals("isPresent", true, installSnapshotStream.isPresent()); - snapshotManager.persist(bytes, Runtime.getRuntime().totalMemory()); + installSnapshotStream.get().write(snapshotState.getBytes()); + + snapshotManager.persist(snapshotState, installSnapshotStream, Runtime.getRuntime().totalMemory()); assertEquals(true, snapshotManager.isCapturing()); @@ -369,12 +393,13 @@ public class SnapshotManagerTest extends AbstractActorTest { SendInstallSnapshot sendInstallSnapshot = sendInstallSnapshotArgumentCaptor.getValue(); - assertTrue(Arrays.equals(bytes, sendInstallSnapshot.getSnapshot().getState())); + assertEquals("state", snapshotState, sendInstallSnapshot.getSnapshot().getState()); + assertArrayEquals("state", snapshotState.getBytes(), sendInstallSnapshot.getSnapshotBytes().read()); } @Test - public void testCallingPersistWithoutCaptureWillDoNothing(){ - snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory()); + public void testCallingPersistWithoutCaptureWillDoNothing() { + snapshotManager.persist(ByteState.empty(), Optional.empty(), Runtime.getRuntime().totalMemory()); verify(mockDataPersistenceProvider, never()).saveSnapshot(any(Snapshot.class)); @@ -382,34 +407,31 @@ public class SnapshotManagerTest extends AbstractActorTest { verify(mockRaftActorBehavior, never()).handleMessage(any(ActorRef.class), any(SendInstallSnapshot.class)); } + @Test - public void testCallingPersistTwiceWillDoNoHarm(){ + public void testCallingPersistTwiceWillDoNoHarm() { doReturn(Integer.MAX_VALUE).when(mockReplicatedLog).dataSize(); // when replicatedToAllIndex = -1 - snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9, - new MockRaftActorContext.MockPayload()), -1, "follower-1"); + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), -1); - snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory()); + snapshotManager.persist(ByteState.empty(), Optional.empty(), Runtime.getRuntime().totalMemory()); - snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory()); + snapshotManager.persist(ByteState.empty(), Optional.empty(), Runtime.getRuntime().totalMemory()); verify(mockDataPersistenceProvider).saveSnapshot(any(Snapshot.class)); verify(mockReplicatedLog).snapshotPreCommit(9L, 6L); - - verify(mockRaftActorBehavior).handleMessage(any(ActorRef.class), any(SendInstallSnapshot.class)); } @Test - public void testCommit(){ + public void testCommit() { doReturn(50L).when(mockDataPersistenceProvider).getLastSequenceNumber(); // when replicatedToAllIndex = -1 - snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9, - new MockRaftActorContext.MockPayload()), -1, "follower-1"); + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), -1); - snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory()); + snapshotManager.persist(ByteState.empty(), Optional.empty(), Runtime.getRuntime().totalMemory()); assertEquals(true, snapshotManager.isCapturing()); @@ -421,7 +443,8 @@ public class SnapshotManagerTest extends AbstractActorTest { verify(mockDataPersistenceProvider).deleteMessages(50L); - ArgumentCaptor criteriaCaptor = ArgumentCaptor.forClass(SnapshotSelectionCriteria.class); + ArgumentCaptor criteriaCaptor = + ArgumentCaptor.forClass(SnapshotSelectionCriteria.class); verify(mockDataPersistenceProvider).deleteSnapshots(criteriaCaptor.capture()); @@ -432,10 +455,9 @@ public class SnapshotManagerTest extends AbstractActorTest { } @Test - public void testCommitBeforePersist(){ + public void testCommitBeforePersist() { // when replicatedToAllIndex = -1 - snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9, - new MockRaftActorContext.MockPayload()), -1, "follower-1"); + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), -1); snapshotManager.commit(100L, 0); @@ -448,7 +470,7 @@ public class SnapshotManagerTest extends AbstractActorTest { } @Test - public void testCommitBeforeCapture(){ + public void testCommitBeforeCapture() { snapshotManager.commit(100L, 0); verify(mockReplicatedLog, never()).snapshotCommit(); @@ -460,14 +482,13 @@ public class SnapshotManagerTest extends AbstractActorTest { } @Test - public void testCallingCommitMultipleTimesCausesNoHarm(){ + public void testCallingCommitMultipleTimesCausesNoHarm() { doReturn(50L).when(mockDataPersistenceProvider).getLastSequenceNumber(); // when replicatedToAllIndex = -1 - snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9, - new MockRaftActorContext.MockPayload()), -1, "follower-1"); + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), -1); - snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory()); + snapshotManager.persist(ByteState.empty(), Optional.empty(), Runtime.getRuntime().totalMemory()); snapshotManager.commit(100L, 0); @@ -481,12 +502,11 @@ public class SnapshotManagerTest extends AbstractActorTest { } @Test - public void testRollback(){ + public void testRollback() { // when replicatedToAllIndex = -1 - snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9, - new MockRaftActorContext.MockPayload()), -1, "follower-1"); + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), -1); - snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory()); + snapshotManager.persist(ByteState.empty(), Optional.empty(), Runtime.getRuntime().totalMemory()); snapshotManager.rollback(); @@ -497,10 +517,9 @@ public class SnapshotManagerTest extends AbstractActorTest { @Test - public void testRollbackBeforePersist(){ + public void testRollbackBeforePersist() { // when replicatedToAllIndex = -1 - snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9, - new MockRaftActorContext.MockPayload()), -1, "follower-1"); + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), -1); snapshotManager.rollback(); @@ -508,19 +527,18 @@ public class SnapshotManagerTest extends AbstractActorTest { } @Test - public void testRollbackBeforeCapture(){ + public void testRollbackBeforeCapture() { snapshotManager.rollback(); verify(mockReplicatedLog, never()).snapshotRollback(); } @Test - public void testCallingRollbackMultipleTimesCausesNoHarm(){ + public void testCallingRollbackMultipleTimesCausesNoHarm() { // when replicatedToAllIndex = -1 - snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9, - new MockRaftActorContext.MockPayload()), -1, "follower-1"); + snapshotManager.capture(new SimpleReplicatedLogEntry(9, 6, new MockRaftActorContext.MockPayload()), -1); - snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory()); + snapshotManager.persist(ByteState.empty(), Optional.empty(), Runtime.getRuntime().totalMemory()); snapshotManager.rollback(); @@ -535,7 +553,7 @@ public class SnapshotManagerTest extends AbstractActorTest { ReplicatedLogEntry replicatedLogEntry = mock(ReplicatedLogEntry.class); doReturn(true).when(mockReplicatedLog).isPresent(10); - doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10); + doReturn(replicatedLogEntry).when(mockReplicatedLog).get(10); doReturn(5L).when(replicatedLogEntry).getTerm(); long retIndex = snapshotManager.trimLog(10); @@ -553,7 +571,7 @@ public class SnapshotManagerTest extends AbstractActorTest { ReplicatedLogEntry replicatedLogEntry = mock(ReplicatedLogEntry.class); doReturn(true).when(mockReplicatedLog).isPresent(10); - doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10); + doReturn(replicatedLogEntry).when(mockReplicatedLog).get(10); doReturn(5L).when(replicatedLogEntry).getTerm(); long retIndex = snapshotManager.trimLog(10); @@ -571,7 +589,7 @@ public class SnapshotManagerTest extends AbstractActorTest { ReplicatedLogEntry replicatedLogEntry = mock(ReplicatedLogEntry.class); doReturn(true).when(mockReplicatedLog).isPresent(10); - doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10); + doReturn(replicatedLogEntry).when(mockReplicatedLog).get(10); doReturn(5L).when(replicatedLogEntry).getTerm(); long retIndex = snapshotManager.trimLog(10); @@ -600,8 +618,8 @@ public class SnapshotManagerTest extends AbstractActorTest { } @Test - public void testTrimLogAfterCapture(){ - boolean capture = snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(1,9, + public void testTrimLogAfterCapture() { + boolean capture = snapshotManager.capture(new SimpleReplicatedLogEntry(9, 1, new MockRaftActorContext.MockPayload()), 9); assertTrue(capture); @@ -611,7 +629,7 @@ public class SnapshotManagerTest extends AbstractActorTest { ReplicatedLogEntry replicatedLogEntry = mock(ReplicatedLogEntry.class); doReturn(20L).when(mockRaftActorContext).getLastApplied(); doReturn(true).when(mockReplicatedLog).isPresent(10); - doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10); + doReturn(replicatedLogEntry).when(mockReplicatedLog).get(10); doReturn(5L).when(replicatedLogEntry).getTerm(); snapshotManager.trimLog(10); @@ -622,9 +640,9 @@ public class SnapshotManagerTest extends AbstractActorTest { } @Test - public void testTrimLogAfterCaptureToInstall(){ - boolean capture = snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(1,9, - new MockRaftActorContext.MockPayload()), 9, "follower-1"); + public void testTrimLogAfterCaptureToInstall() { + boolean capture = snapshotManager.capture(new SimpleReplicatedLogEntry(9, 1, + new MockRaftActorContext.MockPayload()), 9); assertTrue(capture); @@ -633,7 +651,7 @@ public class SnapshotManagerTest extends AbstractActorTest { ReplicatedLogEntry replicatedLogEntry = mock(ReplicatedLogEntry.class); doReturn(20L).when(mockRaftActorContext).getLastApplied(); doReturn(true).when(mockReplicatedLog).isPresent(10); - doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10); + doReturn(replicatedLogEntry).when(mockReplicatedLog).get(10); doReturn(5L).when(replicatedLogEntry).getTerm(); snapshotManager.trimLog(10); @@ -651,7 +669,7 @@ public class SnapshotManagerTest extends AbstractActorTest { doReturn(4L).when(mockReplicatedLog).getSnapshotTerm(); doReturn(7L).when(mockReplicatedLog).getSnapshotIndex(); - ReplicatedLogEntry lastLogEntry = new MockRaftActorContext.MockReplicatedLogEntry(6L, 9L, + ReplicatedLogEntry lastLogEntry = new SimpleReplicatedLogEntry(9L, 6L, new MockRaftActorContext.MockPayload()); // No followers and valid lastLogEntry @@ -667,7 +685,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertEquals("getIndex", -1L, reader.getIndex()); // Followers and valid originalIndex entry - doReturn(new MockRaftActorContext.MockReplicatedLogEntry(5L, 8L, + doReturn(new SimpleReplicatedLogEntry(8L, 5L, new MockRaftActorContext.MockPayload())).when(mockReplicatedLog).get(8L); reader.init(mockReplicatedLog, 8L, lastLogEntry, true);