Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Do not reset datasize after a fake snapshot
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
SnapshotManagerTest.java
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 0dc33130dae32b491b7acaacf42042fc36ce7b49..4cdec8ca672c87fb091f176185e18837c52e0a4f 100644
(file)
--- 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
@@
-194,12
+194,12
@@
public class SnapshotManagerTest extends AbstractActorTest {
CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot();
// LastIndex and LastTerm are picked up from the lastLogEntry
CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot();
// LastIndex and LastTerm are picked up from the lastLogEntry
- assertEquals(
-1L
, captureSnapshot.getLastIndex());
- assertEquals(
-1L
, captureSnapshot.getLastTerm());
+ assertEquals(
0
, captureSnapshot.getLastIndex());
+ assertEquals(
0
, captureSnapshot.getLastTerm());
// Since the actor does not have any followers (no peer addresses) lastApplied will be from lastLogEntry
// Since the actor does not have any followers (no peer addresses) lastApplied will be from lastLogEntry
- assertEquals(
-1L
, captureSnapshot.getLastAppliedIndex());
- assertEquals(
-1L
, captureSnapshot.getLastAppliedTerm());
+ assertEquals(
0
, captureSnapshot.getLastAppliedIndex());
+ assertEquals(
0
, captureSnapshot.getLastAppliedTerm());
//
assertEquals(-1L, captureSnapshot.getReplicatedToAllIndex());
//
assertEquals(-1L, captureSnapshot.getReplicatedToAllIndex());
@@
-448,7
+448,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
verify(mockDataPersistenceProvider).deleteSnapshots(criteriaCaptor.capture());
verify(mockDataPersistenceProvider).deleteSnapshots(criteriaCaptor.capture());
- assertEquals(
100L
, criteriaCaptor.getValue().maxSequenceNr());
+ assertEquals(
Long.MAX_VALUE
, criteriaCaptor.getValue().maxSequenceNr());
assertEquals(1233L, criteriaCaptor.getValue().maxTimestamp());
MessageCollectorActor.expectFirstMatching(actorRef, SnapshotComplete.class);
assertEquals(1233L, criteriaCaptor.getValue().maxTimestamp());
MessageCollectorActor.expectFirstMatching(actorRef, SnapshotComplete.class);
@@
-560,7
+560,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertEquals("return index", 10L, retIndex);
verify(mockReplicatedLog).snapshotPreCommit(10, 5);
assertEquals("return index", 10L, retIndex);
verify(mockReplicatedLog).snapshotPreCommit(10, 5);
- verify(mockReplicatedLog).snapshotCommit();
+ verify(mockReplicatedLog).snapshotCommit(
false
);
verify(mockRaftActorBehavior, never()).setReplicatedToAllIndex(anyLong());
}
verify(mockRaftActorBehavior, never()).setReplicatedToAllIndex(anyLong());
}
@@
-578,7
+578,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
- verify(mockReplicatedLog, never()).snapshotCommit();
+ verify(mockReplicatedLog, never()).snapshotCommit(
false
);
verify(mockRaftActorBehavior, never()).setReplicatedToAllIndex(anyLong());
}
verify(mockRaftActorBehavior, never()).setReplicatedToAllIndex(anyLong());
}
@@
-596,7
+596,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
- verify(mockReplicatedLog, never()).snapshotCommit();
+ verify(mockReplicatedLog, never()).snapshotCommit(
false
);
verify(mockRaftActorBehavior, never()).setReplicatedToAllIndex(anyLong());
}
verify(mockRaftActorBehavior, never()).setReplicatedToAllIndex(anyLong());
}
@@
-611,7
+611,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
- verify(mockReplicatedLog, never()).snapshotCommit();
+ verify(mockReplicatedLog, never()).snapshotCommit(
false
);
// Trim index is greater than replicatedToAllIndex so should update it.
verify(mockRaftActorBehavior).setReplicatedToAllIndex(10L);
// Trim index is greater than replicatedToAllIndex so should update it.
verify(mockRaftActorBehavior).setReplicatedToAllIndex(10L);
@@
-635,8
+635,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.trimLog(10);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
snapshotManager.trimLog(10);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
- verify(mockReplicatedLog, never()).snapshotCommit();
-
+ verify(mockReplicatedLog, never()).snapshotCommit(false);
}
@Test
}
@Test
@@
-658,7
+657,6
@@
public class SnapshotManagerTest extends AbstractActorTest {
verify(mockReplicatedLog, never()).snapshotPreCommit(10, 5);
verify(mockReplicatedLog, never()).snapshotCommit();
verify(mockReplicatedLog, never()).snapshotPreCommit(10, 5);
verify(mockReplicatedLog, never()).snapshotCommit();
-
}
@Test
}
@Test