Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor LeaderTest
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
MockRaftActorContext.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java
b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java
index 2424d4d557f7f1dc58e65a1718e44a6a84db501f..e10fb8d2930556a0fa507d209de9ec5b98f6c947 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java
@@
-12,8
+12,6
@@
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
import akka.actor.ActorSystem;
import akka.actor.Props;
import akka.actor.ActorSelection;
import akka.actor.ActorSystem;
import akka.actor.Props;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
import com.google.common.base.Preconditions;
import com.google.protobuf.GeneratedMessage;
import java.io.Serializable;
import com.google.common.base.Preconditions;
import com.google.protobuf.GeneratedMessage;
import java.io.Serializable;
@@
-22,6
+20,8
@@
import java.util.Map;
import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages;
import org.opendaylight.controller.protobuff.messages.cluster.raft.test.MockPayloadMessages;
import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages;
import org.opendaylight.controller.protobuff.messages.cluster.raft.test.MockPayloadMessages;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MockRaftActorContext implements RaftActorContext {
public class MockRaftActorContext implements RaftActorContext {
@@
-34,6
+34,7
@@
public class MockRaftActorContext implements RaftActorContext {
private ReplicatedLog replicatedLog;
private Map<String, String> peerAddresses = new HashMap<>();
private ConfigParams configParams;
private ReplicatedLog replicatedLog;
private Map<String, String> peerAddresses = new HashMap<>();
private ConfigParams configParams;
+ private boolean snapshotCaptureInitiated;
public MockRaftActorContext(){
electionTerm = null;
public MockRaftActorContext(){
electionTerm = null;
@@
-52,17
+53,20
@@
public class MockRaftActorContext implements RaftActorContext {
* Identifier of the actor whose election term information this is
*/
private final String id = id1;
* Identifier of the actor whose election term information this is
*/
private final String id = id1;
- private long currentTerm =
0
;
+ private long currentTerm =
1
;
private String votedFor = "";
private String votedFor = "";
+ @Override
public long getCurrentTerm() {
return currentTerm;
}
public long getCurrentTerm() {
return currentTerm;
}
+ @Override
public String getVotedFor() {
return votedFor;
}
public String getVotedFor() {
return votedFor;
}
+ @Override
public void update(long currentTerm, String votedFor){
this.currentTerm = currentTerm;
this.votedFor = votedFor;
public void update(long currentTerm, String votedFor){
this.currentTerm = currentTerm;
this.votedFor = votedFor;
@@
-84,7
+88,9
@@
public class MockRaftActorContext implements RaftActorContext {
public void initReplicatedLog(){
this.replicatedLog = new SimpleReplicatedLog();
public void initReplicatedLog(){
this.replicatedLog = new SimpleReplicatedLog();
- this.replicatedLog.append(new MockReplicatedLogEntry(1, 1, new MockPayload("")));
+ long term = getTermInformation().getCurrentTerm();
+ this.replicatedLog.append(new MockReplicatedLogEntry(term, 0, new MockPayload("1")));
+ this.replicatedLog.append(new MockReplicatedLogEntry(term, 1, new MockPayload("2")));
}
@Override public ActorRef actorOf(Props props) {
}
@Override public ActorRef actorOf(Props props) {
@@
-127,6
+133,7
@@
public class MockRaftActorContext implements RaftActorContext {
return lastApplied;
}
return lastApplied;
}
+ @Override
public void setReplicatedLog(ReplicatedLog replicatedLog) {
this.replicatedLog = replicatedLog;
}
public void setReplicatedLog(ReplicatedLog replicatedLog) {
this.replicatedLog = replicatedLog;
}
@@
-139,8
+146,8
@@
public class MockRaftActorContext implements RaftActorContext {
return this.system;
}
return this.system;
}
- @Override public Logg
ingAdapt
er getLogger() {
- return Logg
ing.getLogger(system, this
);
+ @Override public Logger getLogger() {
+ return Logg
erFactory.getLogger(getClass()
);
}
@Override public Map<String, String> getPeerAddresses() {
}
@Override public Map<String, String> getPeerAddresses() {
@@
-181,6
+188,16
@@
public class MockRaftActorContext implements RaftActorContext {
return configParams;
}
return configParams;
}
+ @Override
+ public void setSnapshotCaptureInitiated(boolean snapshotCaptureInitiated) {
+ this.snapshotCaptureInitiated = snapshotCaptureInitiated;
+ }
+
+ @Override
+ public boolean isSnapshotCaptureInitiated() {
+ return snapshotCaptureInitiated;
+ }
+
public void setConfigParams(ConfigParams configParams) {
this.configParams = configParams;
}
public void setConfigParams(ConfigParams configParams) {
this.configParams = configParams;
}
@@
-202,7
+219,7
@@
public class MockRaftActorContext implements RaftActorContext {
}
public static class MockPayload extends Payload implements Serializable {
}
public static class MockPayload extends Payload implements Serializable {
- private static final long serialVersionUID =
1
L;
+ private static final long serialVersionUID =
3121380393130864247
L;
private String value = "";
public MockPayload(){
private String value = "";
public MockPayload(){
@@
-235,6
+252,7
@@
public class MockRaftActorContext implements RaftActorContext {
return MockPayload.class.getName();
}
return MockPayload.class.getName();
}
+ @Override
public String toString() {
return value;
}
public String toString() {
return value;
}
@@
-273,7
+291,7
@@
public class MockRaftActorContext implements RaftActorContext {
}
public static class MockReplicatedLogBuilder {
}
public static class MockReplicatedLogBuilder {
- private ReplicatedLog mockLog = new SimpleReplicatedLog();
+ private
final
ReplicatedLog mockLog = new SimpleReplicatedLog();
public MockReplicatedLogBuilder createEntries(int start, int end, int term) {
for (int i=start; i<end; i++) {
public MockReplicatedLogBuilder createEntries(int start, int end, int term) {
for (int i=start; i<end; i++) {