Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix AppendEntry logic when prevLogIndex and prevLogTerm is -1
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
behaviors
/
AbstractRaftActorBehavior.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java
index c276d32cce33d5b5bfada40f7f62afb6244a2e07..a1bc3eea65a3003ff8d4ef38aa3a3cbbc44519a6 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java
@@
-61,6
+61,8
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
*/
protected String leaderId = null;
*/
protected String leaderId = null;
+ private short leaderPayloadVersion = -1;
+
private long replicatedToAllIndex = -1;
private final String logName;
private long replicatedToAllIndex = -1;
private final String logName;
@@
-104,7
+106,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
*
* @param sender The actor that sent this message
* @param appendEntries The AppendEntries message
*
* @param sender The actor that sent this message
* @param appendEntries The AppendEntries message
- * @return
+ * @return
a new behavior if it was changed or the current behavior
*/
protected abstract RaftActorBehavior handleAppendEntries(ActorRef sender,
AppendEntries appendEntries);
*/
protected abstract RaftActorBehavior handleAppendEntries(ActorRef sender,
AppendEntries appendEntries);
@@
-116,7
+118,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
*
* @param sender
* @param appendEntries
*
* @param sender
* @param appendEntries
- * @return
+ * @return
a new behavior if it was changed or the current behavior
*/
protected RaftActorBehavior appendEntries(ActorRef sender,
AppendEntries appendEntries) {
*/
protected RaftActorBehavior appendEntries(ActorRef sender,
AppendEntries appendEntries) {
@@
-130,7
+132,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
sender.tell(
new AppendEntriesReply(context.getId(), currentTerm(), false,
sender.tell(
new AppendEntriesReply(context.getId(), currentTerm(), false,
- lastIndex(), lastTerm()), actor()
+ lastIndex(), lastTerm()
, context.getPayloadVersion()
), actor()
);
return this;
}
);
return this;
}
@@
-149,7
+151,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
*
* @param sender The actor that sent this message
* @param appendEntriesReply The AppendEntriesReply message
*
* @param sender The actor that sent this message
* @param appendEntriesReply The AppendEntriesReply message
- * @return
+ * @return
a new behavior if it was changed or the current behavior
*/
protected abstract RaftActorBehavior handleAppendEntriesReply(ActorRef sender,
AppendEntriesReply appendEntriesReply);
*/
protected abstract RaftActorBehavior handleAppendEntriesReply(ActorRef sender,
AppendEntriesReply appendEntriesReply);
@@
-160,7
+162,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
*
* @param sender
* @param requestVote
*
* @param sender
* @param requestVote
- * @return
+ * @return
a new behavior if it was changed or the current behavior
*/
protected RaftActorBehavior requestVote(ActorRef sender, RequestVote requestVote) {
*/
protected RaftActorBehavior requestVote(ActorRef sender, RequestVote requestVote) {
@@
-219,15
+221,14
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
*
* @param sender The actor that sent this message
* @param requestVoteReply The RequestVoteReply message
*
* @param sender The actor that sent this message
* @param requestVoteReply The RequestVoteReply message
- * @return
+ * @return
a new behavior if it was changed or the current behavior
*/
protected abstract RaftActorBehavior handleRequestVoteReply(ActorRef sender,
RequestVoteReply requestVoteReply);
/**
*/
protected abstract RaftActorBehavior handleRequestVoteReply(ActorRef sender,
RequestVoteReply requestVoteReply);
/**
- * Creates a random election duration
*
*
- * @return
+ * @return
a random election duration
*/
protected FiniteDuration electionDuration() {
long variance = new Random().nextInt(context.getConfigParams().getElectionTimeVariance());
*/
protected FiniteDuration electionDuration() {
long variance = new Random().nextInt(context.getConfigParams().getElectionTimeVariance());
@@
-247,7
+248,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
/**
* schedule a new election
*
/**
* schedule a new election
*
- * @param interval
+ * @param interval
the duration after which we should trigger a new election
*/
protected void scheduleElection(FiniteDuration interval) {
stopElection();
*/
protected void scheduleElection(FiniteDuration interval) {
stopElection();
@@
-261,62
+262,52
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
}
/**
}
/**
- * Get the current term
- * @return
+ * @return the current term
*/
protected long currentTerm() {
return context.getTermInformation().getCurrentTerm();
}
/**
*/
protected long currentTerm() {
return context.getTermInformation().getCurrentTerm();
}
/**
- * Get the candidate for whom we voted in the current term
- * @return
+ * @return the candidate for whom we voted in the current term
*/
protected String votedFor() {
return context.getTermInformation().getVotedFor();
}
/**
*/
protected String votedFor() {
return context.getTermInformation().getVotedFor();
}
/**
- * Get the actor associated with this behavior
- * @return
+ * @return the actor associated with this behavior
*/
protected ActorRef actor() {
return context.getActor();
}
/**
*/
protected ActorRef actor() {
return context.getActor();
}
/**
- * Get the term from the last entry in the log
*
*
- * @return
+ * @return
the term from the last entry in the log
*/
protected long lastTerm() {
return context.getReplicatedLog().lastTerm();
}
/**
*/
protected long lastTerm() {
return context.getReplicatedLog().lastTerm();
}
/**
- * Get the index from the last entry in the log
- *
- * @return
+ * @return the index from the last entry in the log
*/
protected long lastIndex() {
return context.getReplicatedLog().lastIndex();
}
/**
*/
protected long lastIndex() {
return context.getReplicatedLog().lastIndex();
}
/**
- * Find the client request tracker for a specific logIndex
- *
* @param logIndex
* @param logIndex
- * @return
+ * @return
the client request tracker for the specified logIndex
*/
protected ClientRequestTracker findClientRequestTracker(long logIndex) {
return null;
}
/**
*/
protected ClientRequestTracker findClientRequestTracker(long logIndex) {
return null;
}
/**
- * Find the client request tracker for a specific logIndex
- *
* @param logIndex
* @param logIndex
- * @return
+ * @return
the client request tracker for the specified logIndex
*/
protected ClientRequestTracker removeClientRequestTracker(long logIndex) {
return null;
*/
protected ClientRequestTracker removeClientRequestTracker(long logIndex) {
return null;
@@
-324,9
+315,8
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
/**
/**
- * Find the log index from the previous to last entry in the log
*
*
- * @return
+ * @return
log index from the previous to last entry in the log
*/
protected long prevLogIndex(long index){
ReplicatedLogEntry prevEntry =
*/
protected long prevLogIndex(long index){
ReplicatedLogEntry prevEntry =
@@
-338,8
+328,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
}
/**
}
/**
- * Find the log term from the previous to last entry in the log
- * @return
+ * @return log term from the previous to last entry in the log
*/
protected long prevLogTerm(long index){
ReplicatedLogEntry prevEntry =
*/
protected long prevLogTerm(long index){
ReplicatedLogEntry prevEntry =
@@
-420,6
+409,15
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
return leaderId;
}
return leaderId;
}
+ @Override
+ public short getLeaderPayloadVersion() {
+ return leaderPayloadVersion;
+ }
+
+ public void setLeaderPayloadVersion(short leaderPayloadVersion) {
+ this.leaderPayloadVersion = leaderPayloadVersion;
+ }
+
protected RaftActorBehavior switchBehavior(RaftActorBehavior behavior) {
LOG.info("{} :- Switching from behavior {} to {}", logName(), this.state(), behavior.state());
try {
protected RaftActorBehavior switchBehavior(RaftActorBehavior behavior) {
LOG.info("{} :- Switching from behavior {} to {}", logName(), this.state(), behavior.state());
try {