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 intermittent failure in testRemoveShardReplica
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
behaviors
/
Leader.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
index 77853f38c8fd2cd55b8ee882fa8682af8f0dba3c..58cf7161062c1eb67568930fb15252aadd21a23e 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
@@
-19,7
+19,7
@@
import org.opendaylight.controller.cluster.raft.FollowerLogInformation;
import org.opendaylight.controller.cluster.raft.RaftActorContext;
import org.opendaylight.controller.cluster.raft.RaftActorLeadershipTransferCohort;
import org.opendaylight.controller.cluster.raft.RaftState;
import org.opendaylight.controller.cluster.raft.RaftActorContext;
import org.opendaylight.controller.cluster.raft.RaftActorLeadershipTransferCohort;
import org.opendaylight.controller.cluster.raft.RaftState;
-import org.opendaylight.controller.cluster.raft.base.messages.
ElectionTimeout
;
+import org.opendaylight.controller.cluster.raft.base.messages.
TimeoutNow
;
import org.opendaylight.controller.cluster.raft.messages.AppendEntriesReply;
/**
import org.opendaylight.controller.cluster.raft.messages.AppendEntriesReply;
/**
@@
-55,8
+55,12
@@
public class Leader extends AbstractLeader {
private final Stopwatch isolatedLeaderCheck = Stopwatch.createStarted();
private @Nullable LeadershipTransferContext leadershipTransferContext;
private final Stopwatch isolatedLeaderCheck = Stopwatch.createStarted();
private @Nullable LeadershipTransferContext leadershipTransferContext;
+ Leader(RaftActorContext context, @Nullable AbstractLeader initializeFromLeader) {
+ super(context, RaftState.Leader, initializeFromLeader);
+ }
+
public Leader(RaftActorContext context) {
public Leader(RaftActorContext context) {
-
super(context, RaftState.Leader
);
+
this(context, null
);
}
@Override
}
@Override
@@
-147,9
+151,9
@@
public class Leader extends AbstractLeader {
// additional AppendEntries with the latest commit index.
sendAppendEntries(0, false);
// additional AppendEntries with the latest commit index.
sendAppendEntries(0, false);
- // Now send a
n ElectionTimeout
to the matching follower to immediately start an election.
+ // Now send a
TimeoutNow message
to the matching follower to immediately start an election.
ActorSelection followerActor = context.getPeerActorSelection(followerId);
ActorSelection followerActor = context.getPeerActorSelection(followerId);
- followerActor.tell(
ElectionTimeout
.INSTANCE, context.getActor());
+ followerActor.tell(
TimeoutNow
.INSTANCE, context.getActor());
LOG.debug("{}: Leader transfer complete", logName());
LOG.debug("{}: Leader transfer complete", logName());