Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "NPE in RaftActor#onGetOnDemandRaftStats"
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
RaftActor.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
index 1101af8442e656d749acd379bdda0b298058685c..1738cc5fe001ab8b30cfd105f67dc4d9adcc8200 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java
@@
-16,10
+16,10
@@
import akka.persistence.SnapshotSelectionCriteria;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import java.io.Serializable;
import java.util.Collection;
import com.google.common.collect.Lists;
import java.io.Serializable;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@
-127,7
+127,7
@@
public abstract class RaftActor extends AbstractUntypedPersistentActor {
(configParams.isPresent() ? configParams.get(): new DefaultConfigParamsImpl()),
delegatingPersistenceProvider, LOG);
(configParams.isPresent() ? configParams.get(): new DefaultConfigParamsImpl()),
delegatingPersistenceProvider, LOG);
- context.setReplicatedLog(ReplicatedLogImpl.newInstance(context,
delegatingPersistenceProvider,
currentBehavior));
+ context.setReplicatedLog(ReplicatedLogImpl.newInstance(context, currentBehavior));
}
@Override
}
@Override
@@
-179,8
+179,7
@@
public abstract class RaftActor extends AbstractUntypedPersistentActor {
}
protected RaftActorRecoverySupport newRaftActorRecoverySupport() {
}
protected RaftActorRecoverySupport newRaftActorRecoverySupport() {
- return new RaftActorRecoverySupport(delegatingPersistenceProvider, context, currentBehavior,
- getRaftActorRecoveryCohort());
+ return new RaftActorRecoverySupport(context, currentBehavior, getRaftActorRecoveryCohort());
}
protected void initializeBehavior(){
}
protected void initializeBehavior(){
@@
-195,11
+194,6
@@
public abstract class RaftActor extends AbstractUntypedPersistentActor {
@Override
public void handleCommand(Object message) {
@Override
public void handleCommand(Object message) {
- boolean handled = snapshotSupport.handleSnapshotMessage(message);
- if(handled) {
- return;
- }
-
if (message instanceof ApplyState){
ApplyState applyState = (ApplyState) message;
if (message instanceof ApplyState){
ApplyState applyState = (ApplyState) message;
@@
-233,7
+227,7
@@
public abstract class RaftActor extends AbstractUntypedPersistentActor {
);
} else if(message instanceof GetOnDemandRaftState) {
onGetOnDemandRaftStats();
);
} else if(message instanceof GetOnDemandRaftState) {
onGetOnDemandRaftStats();
- } else {
+ } else
if(!snapshotSupport.handleSnapshotMessage(message))
{
reusableBehaviorStateHolder.init(getCurrentBehavior());
setCurrentBehavior(currentBehavior.handleMessage(getSender(), message));
reusableBehaviorStateHolder.init(getCurrentBehavior());
setCurrentBehavior(currentBehavior.handleMessage(getSender(), message));
@@
-243,8
+237,8
@@
public abstract class RaftActor extends AbstractUntypedPersistentActor {
}
protected RaftActorSnapshotMessageSupport newRaftActorSnapshotMessageSupport() {
}
protected RaftActorSnapshotMessageSupport newRaftActorSnapshotMessageSupport() {
- return new RaftActorSnapshotMessageSupport(
delegatingPersistenceProvider, context
,
-
currentBehavior,
getRaftActorSnapshotCohort());
+ return new RaftActorSnapshotMessageSupport(
context, currentBehavior
,
+ getRaftActorSnapshotCohort());
}
private void onGetOnDemandRaftStats() {
}
private void onGetOnDemandRaftStats() {
@@
-265,7
+259,7
@@
public abstract class RaftActor extends AbstractUntypedPersistentActor {
.snapshotIndex(replicatedLog().getSnapshotIndex())
.snapshotTerm(replicatedLog().getSnapshotTerm())
.votedFor(context.getTermInformation().getVotedFor())
.snapshotIndex(replicatedLog().getSnapshotIndex())
.snapshotTerm(replicatedLog().getSnapshotTerm())
.votedFor(context.getTermInformation().getVotedFor())
- .peerAddresses(
ImmutableMap.copyOf
(context.getPeerAddresses()));
+ .peerAddresses(
new HashMap<>
(context.getPeerAddresses()));
ReplicatedLogEntry lastLogEntry = getLastLogEntry();
if (lastLogEntry != null) {
ReplicatedLogEntry lastLogEntry = getLastLogEntry();
if (lastLogEntry != null) {