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 5740: Remove Serializable where not necessary
[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 80ed698d6cdcfae29120c7d93e92f8283f9ae81d..e8c1b09772f172157c177c747b1bc2f7c5b51430 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
@@
-131,7
+131,7
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
// 1. Reply false if term < currentTerm (§5.1)
if (appendEntries.getTerm() < currentTerm()) {
// 1. Reply false if term < currentTerm (§5.1)
if (appendEntries.getTerm() < currentTerm()) {
- log.
debug("{}: Cannot append entries because sender
term {} is less than {}", logName(),
+ log.
info("{}: Cannot append entries because sender's
term {} is less than {}", logName(),
appendEntries.getTerm(), currentTerm());
sender.tell(new AppendEntriesReply(context.getId(), currentTerm(), false, lastIndex(), lastTerm(),
appendEntries.getTerm(), currentTerm());
sender.tell(new AppendEntriesReply(context.getId(), currentTerm(), false, lastIndex(), lastTerm(),
@@
-167,7
+167,8
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
*/
protected RaftActorBehavior requestVote(ActorRef sender, RequestVote requestVote) {
*/
protected RaftActorBehavior requestVote(ActorRef sender, RequestVote requestVote) {
- log.debug("{}: In requestVote: {}", logName(), requestVote);
+ log.debug("{}: In requestVote: {} - currentTerm: {}, votedFor: {}, lastIndex: {}, lastTerm: {}", logName(),
+ requestVote, currentTerm(), votedFor(), lastIndex(), lastTerm());
boolean grantVote = canGrantVote(requestVote);
boolean grantVote = canGrantVote(requestVote);
@@
-433,7
+434,8
@@
public abstract class AbstractRaftActorBehavior implements RaftActorBehavior {
return this;
}
return this;
}
- log.info("{} :- Switching from behavior {} to {}", logName(), this.state(), newBehavior.state());
+ log.info("{} :- Switching from behavior {} to {}, election term: {}", logName(), this.state(),
+ newBehavior.state(), context.getTermInformation().getCurrentTerm());
try {
close();
} catch (RuntimeException e) {
try {
close();
} catch (RuntimeException e) {