Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reset snapshot progress after timeout has been hit
[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 05b1d34a0f8b921cffbd192c0b9bb9cfefc6c494..8c17e1e8e8e9d4060221f8c68b2a980f3f6b1b32 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,9
+12,8
@@
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.japi.Procedure;
-import com.google.common.base.Throwables;
import com.google.common.io.ByteSource;
import com.google.common.io.ByteSource;
+import com.google.common.util.concurrent.MoreExecutors;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
@@
-22,6
+21,7
@@
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;
+import org.opendaylight.controller.cluster.DataPersistenceProvider;
import org.opendaylight.controller.cluster.NonPersistentDataProvider;
import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior;
import org.opendaylight.controller.cluster.raft.persisted.ByteState;
import org.opendaylight.controller.cluster.NonPersistentDataProvider;
import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior;
import org.opendaylight.controller.cluster.raft.persisted.ByteState;
@@
-55,29
+55,34
@@
public class MockRaftActorContext extends RaftActorContextImpl {
}
@Override
}
@Override
- public void update(
long newTerm,
String newVotedFor) {
+ public void update(
final long newTerm, final
String newVotedFor) {
this.currentTerm = newTerm;
this.votedFor = newVotedFor;
// TODO : Write to some persistent state
}
this.currentTerm = newTerm;
this.votedFor = newVotedFor;
// TODO : Write to some persistent state
}
- @Override public void updateAndPersist(
long newTerm,
String newVotedFor) {
+ @Override public void updateAndPersist(
final long newTerm, final
String newVotedFor) {
update(newTerm, newVotedFor);
}
};
}
update(newTerm, newVotedFor);
}
};
}
+ private static DataPersistenceProvider createProvider() {
+ return new NonPersistentDataProvider(Runnable::run);
+ }
+
public MockRaftActorContext() {
super(null, null, "test", newElectionTerm(), -1, -1, new HashMap<>(),
public MockRaftActorContext() {
super(null, null, "test", newElectionTerm(), -1, -1, new HashMap<>(),
- new DefaultConfigParamsImpl(), new NonPersistentDataProvider(), applyState -> { }, LOG);
+ new DefaultConfigParamsImpl(), createProvider(), applyState -> { }, LOG,
+ MoreExecutors.directExecutor());
setReplicatedLog(new MockReplicatedLogBuilder().build());
}
setReplicatedLog(new MockReplicatedLogBuilder().build());
}
- public MockRaftActorContext(
String id, ActorSystem system,
ActorRef actor) {
+ public MockRaftActorContext(
final String id, final ActorSystem system, final
ActorRef actor) {
super(actor, null, id, newElectionTerm(), -1, -1, new HashMap<>(),
super(actor, null, id, newElectionTerm(), -1, -1, new HashMap<>(),
- new DefaultConfigParamsImpl(),
new NonPersistentDataProvider()
,
-
applyState -> actor.tell(applyState, actor), LOG
);
+ new DefaultConfigParamsImpl(),
createProvider(), applyState -> actor.tell(applyState, actor), LOG
,
+
MoreExecutors.directExecutor()
);
this.system = system;
this.system = system;
@@
-95,11
+100,11
@@
public class MockRaftActorContext extends RaftActorContextImpl {
setLastApplied(replicatedLog.lastIndex());
}
setLastApplied(replicatedLog.lastIndex());
}
- @Override public ActorRef actorOf(Props props) {
+ @Override public ActorRef actorOf(
final
Props props) {
return system.actorOf(props);
}
return system.actorOf(props);
}
- @Override public ActorSelection actorSelection(String path) {
+ @Override public ActorSelection actorSelection(
final
String path) {
return system.actorSelection(path);
}
return system.actorSelection(path);
}
@@
-107,7
+112,7
@@
public class MockRaftActorContext extends RaftActorContextImpl {
return this.system;
}
return this.system;
}
- @Override public ActorSelection getPeerActorSelection(String peerId) {
+ @Override public ActorSelection getPeerActorSelection(
final
String peerId) {
String peerAddress = getPeerAddress(peerId);
if (peerAddress != null) {
return actorSelection(peerAddress);
String peerAddress = getPeerAddress(peerId);
if (peerAddress != null) {
return actorSelection(peerAddress);
@@
-115,7
+120,7
@@
public class MockRaftActorContext extends RaftActorContextImpl {
return null;
}
return null;
}
- public void setPeerAddresses(Map<String, String> peerAddresses) {
+ public void setPeerAddresses(
final
Map<String, String> peerAddresses) {
for (String id: getPeerIds()) {
removePeer(id);
}
for (String id: getPeerIds()) {
removePeer(id);
}
@@
-132,23
+137,23
@@
public class MockRaftActorContext extends RaftActorContextImpl {
snapshotManager.setSnapshotCohort(new RaftActorSnapshotCohort() {
@Override
snapshotManager.setSnapshotCohort(new RaftActorSnapshotCohort() {
@Override
- public State deserializeSnapshot(ByteSource snapshotBytes) throws IOException {
+ public State deserializeSnapshot(
final
ByteSource snapshotBytes) throws IOException {
return ByteState.of(snapshotBytes.read());
}
@Override
return ByteState.of(snapshotBytes.read());
}
@Override
- public void createSnapshot(
ActorRef actorRef, java.util.
Optional<OutputStream> installSnapshotStream) {
+ public void createSnapshot(
final ActorRef actorRef, final
Optional<OutputStream> installSnapshotStream) {
}
@Override
}
@Override
- public void applySnapshot(State snapshotState) {
+ public void applySnapshot(
final
State snapshotState) {
}
});
return snapshotManager;
}
}
});
return snapshotManager;
}
- public void setCreateSnapshotProcedure(Consumer<Optional<OutputStream>> createSnapshotProcedure) {
+ public void setCreateSnapshotProcedure(
final
Consumer<Optional<OutputStream>> createSnapshotProcedure) {
this.createSnapshotProcedure = createSnapshotProcedure;
}
this.createSnapshotProcedure = createSnapshotProcedure;
}
@@
-157,7
+162,7
@@
public class MockRaftActorContext extends RaftActorContextImpl {
return raftPolicy != null ? raftPolicy : super.getRaftPolicy();
}
return raftPolicy != null ? raftPolicy : super.getRaftPolicy();
}
- public void setRaftPolicy(RaftPolicy raftPolicy) {
+ public void setRaftPolicy(
final
RaftPolicy raftPolicy) {
this.raftPolicy = raftPolicy;
}
this.raftPolicy = raftPolicy;
}
@@
-168,31
+173,27
@@
public class MockRaftActorContext extends RaftActorContextImpl {
}
@Override
}
@Override
- public void captureSnapshotIfReady(ReplicatedLogEntry replicatedLogEntry) {
+ public void captureSnapshotIfReady(
final
ReplicatedLogEntry replicatedLogEntry) {
}
@Override
}
@Override
- public boolean shouldCaptureSnapshot(long logIndex) {
+ public boolean shouldCaptureSnapshot(
final
long logIndex) {
return false;
}
@Override
return false;
}
@Override
- public boolean removeFromAndPersist(long index) {
+ public boolean removeFromAndPersist(
final
long index) {
return removeFrom(index) >= 0;
}
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
return removeFrom(index) >= 0;
}
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
- public boolean appendAndPersist(
ReplicatedLogEntry replicatedLogEntry, Procedure<ReplicatedLogEntry> callback
,
- boolean doAsync) {
+ public boolean appendAndPersist(
final ReplicatedLogEntry replicatedLogEntry
,
+
final Consumer<ReplicatedLogEntry> callback, final
boolean doAsync) {
append(replicatedLogEntry);
if (callback != null) {
append(replicatedLogEntry);
if (callback != null) {
- try {
- callback.apply(replicatedLogEntry);
- } catch (Exception e) {
- Throwables.propagate(e);
- }
+ callback.accept(replicatedLogEntry);
}
return true;
}
return true;
@@
-207,12
+208,12
@@
public class MockRaftActorContext extends RaftActorContextImpl {
public MockPayload() {
}
public MockPayload() {
}
- public MockPayload(String data) {
+ public MockPayload(
final
String data) {
this.value = data;
size = value.length();
}
this.value = data;
size = value.length();
}
- public MockPayload(
String data,
int size) {
+ public MockPayload(
final String data, final
int size) {
this(data);
this.size = size;
}
this(data);
this.size = size;
}
@@
-236,7
+237,7
@@
public class MockRaftActorContext extends RaftActorContextImpl {
}
@Override
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(
final
Object obj) {
if (this == obj) {
return true;
}
if (this == obj) {
return true;
}
@@
-261,7
+262,7
@@
public class MockRaftActorContext extends RaftActorContextImpl {
public static class MockReplicatedLogBuilder {
private final ReplicatedLog mockLog = new SimpleReplicatedLog();
public static class MockReplicatedLogBuilder {
private final ReplicatedLog mockLog = new SimpleReplicatedLog();
- public MockReplicatedLogBuilder createEntries(
int start, int end,
int term) {
+ public MockReplicatedLogBuilder createEntries(
final int start, final int end, final
int term) {
for (int i = start; i < end; i++) {
this.mockLog.append(new SimpleReplicatedLogEntry(i, term,
new MockRaftActorContext.MockPayload(Integer.toString(i))));
for (int i = start; i < end; i++) {
this.mockLog.append(new SimpleReplicatedLogEntry(i, term,
new MockRaftActorContext.MockPayload(Integer.toString(i))));
@@
-269,7
+270,7
@@
public class MockRaftActorContext extends RaftActorContextImpl {
return this;
}
return this;
}
- public MockReplicatedLogBuilder addEntry(
int index, int term,
MockPayload payload) {
+ public MockReplicatedLogBuilder addEntry(
final int index, final int term, final
MockPayload payload) {
this.mockLog.append(new SimpleReplicatedLogEntry(index, term, payload));
return this;
}
this.mockLog.append(new SimpleReplicatedLogEntry(index, term, payload));
return this;
}