Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG 2185 : Disable all internal switching of behavior
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
behaviors
/
AbstractLeader.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
index 94fa507b47aff41a6d4308ca687db8639c955559..85f2f153ab3046d6541225c95d3863be3435b6b0 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
@@
-333,7
+333,7
@@
public abstract class AbstractLeader extends AbstractRaftActorBehavior {
context.getTermInformation().updateAndPersist(rpc.getTerm(), null);
context.getTermInformation().updateAndPersist(rpc.getTerm(), null);
- return
switchBehavior(new Follower(context)
);
+ return
internalSwitchBehavior(RaftState.Follower
);
}
}
}
}
@@
-451,10
+451,15
@@
public abstract class AbstractLeader extends AbstractRaftActorBehavior {
logIndex)
);
logIndex)
);
- if (followerToLog.isEmpty()) {
+ boolean applyModificationToState = followerToLog.isEmpty()
+ || context.getRaftPolicy().applyModificationToStateBeforeConsensus();
+
+ if(applyModificationToState){
context.setCommitIndex(logIndex);
applyLogToStateMachine(logIndex);
context.setCommitIndex(logIndex);
applyLogToStateMachine(logIndex);
- } else {
+ }
+
+ if (!followerToLog.isEmpty()) {
sendAppendEntries(0, false);
}
}
sendAppendEntries(0, false);
}
}