X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2Fbehaviors%2FCandidate.java;h=52ed26758ee26b6f9949fa1202f1a44628b82364;hp=bb1927ef231949bd320d0cf060d6a9a8018829bb;hb=bad1f8b8f3c1780cd37ec8a817ef4b0f23901654;hpb=971b179000ef1cc56699de35061cf6f97d4cf36f
diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Candidate.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Candidate.java
index bb1927ef23..52ed26758e 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Candidate.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Candidate.java
@@ -10,6 +10,9 @@ package org.opendaylight.controller.cluster.raft.behaviors;
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.opendaylight.controller.cluster.raft.PeerInfo;
import org.opendaylight.controller.cluster.raft.RaftActorContext;
import org.opendaylight.controller.cluster.raft.RaftState;
import org.opendaylight.controller.cluster.raft.base.messages.ElectionTimeout;
@@ -19,8 +22,6 @@ import org.opendaylight.controller.cluster.raft.messages.RaftRPC;
import org.opendaylight.controller.cluster.raft.messages.RequestVote;
import org.opendaylight.controller.cluster.raft.messages.RequestVoteReply;
-import java.util.Set;
-
/**
* The behavior of a RaftActor when it is in the CandidateState
*
@@ -45,103 +46,130 @@ public class Candidate extends AbstractRaftActorBehavior {
private final int votesRequired;
- private final Set peers;
+ private final Collection votingPeers = new ArrayList<>();
public Candidate(RaftActorContext context) {
- super(context);
-
- peers = context.getPeerAddresses().keySet();
-
- context.getLogger().debug("Election:Candidate has following peers:"+ peers);
-
- if(peers.size() > 0) {
- // Votes are required from a majority of the peers including self.
- // The votesRequired field therefore stores a calculated value
- // of the number of votes required for this candidate to win an
- // election based on it's known peers.
- // If a peer was added during normal operation and raft replicas
- // came to know about them then the new peer would also need to be
- // taken into consideration when calculating this value.
- // Here are some examples for what the votesRequired would be for n
- // peers
- // 0 peers = 1 votesRequired (0 + 1) / 2 + 1 = 1
- // 2 peers = 2 votesRequired (2 + 1) / 2 + 1 = 2
- // 4 peers = 3 votesRequired (4 + 1) / 2 + 1 = 3
- int noOfPeers = peers.size();
- int self = 1;
- votesRequired = (noOfPeers + self) / 2 + 1;
- } else {
- votesRequired = 0;
+ super(context, RaftState.Candidate);
+
+ for(PeerInfo peer: context.getPeers()) {
+ if(peer.isVoting()) {
+ votingPeers.add(peer.getId());
+ }
}
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("{}: Election: Candidate has following voting peers: {}", logName(), votingPeers);
+ }
+
+ votesRequired = getMajorityVoteCount(votingPeers.size());
+
startNewTerm();
- scheduleElection(electionDuration());
+
+ if(votingPeers.isEmpty()){
+ actor().tell(ElectionTimeout.INSTANCE, actor());
+ } else {
+ scheduleElection(electionDuration());
+ }
+ }
+
+ @Override
+ public final String getLeaderId() {
+ return null;
+ }
+
+ @Override
+ public final short getLeaderPayloadVersion() {
+ return -1;
}
- @Override protected RaftState handleAppendEntries(ActorRef sender,
+ @Override
+ protected RaftActorBehavior handleAppendEntries(ActorRef sender,
AppendEntries appendEntries) {
- context.getLogger().debug(appendEntries.toString());
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("{}: handleAppendEntries: {}", logName(), appendEntries);
+ }
- return state();
- }
+ // Some other candidate for the same term became a leader and sent us an append entry
+ if(currentTerm() == appendEntries.getTerm()){
+ LOG.debug("{}: New Leader sent an append entry to Candidate for term {} will switch to Follower",
+ logName(), currentTerm());
- @Override protected RaftState handleAppendEntriesReply(ActorRef sender,
- AppendEntriesReply appendEntriesReply) {
+ return switchBehavior(new Follower(context));
+ }
- return state();
+ return this;
}
- @Override protected RaftState handleRequestVoteReply(ActorRef sender,
- RequestVoteReply requestVoteReply) {
+ @Override
+ protected RaftActorBehavior handleAppendEntriesReply(ActorRef sender, AppendEntriesReply appendEntriesReply) {
+ return this;
+ }
+
+ @Override
+ protected RaftActorBehavior handleRequestVoteReply(ActorRef sender, RequestVoteReply requestVoteReply) {
+ LOG.debug("{}: handleRequestVoteReply: {}, current voteCount: {}", logName(), requestVoteReply, voteCount);
if (requestVoteReply.isVoteGranted()) {
voteCount++;
}
if (voteCount >= votesRequired) {
- return RaftState.Leader;
+ if(context.getCommitIndex() < context.getReplicatedLog().lastIndex()) {
+ LOG.debug("{}: Connmit index {} is behind last index {}", logName(), context.getCommitIndex(),
+ context.getReplicatedLog().lastIndex());
+ return internalSwitchBehavior(RaftState.PreLeader);
+ } else {
+ return internalSwitchBehavior(RaftState.Leader);
+ }
}
- return state();
- }
-
- @Override public RaftState state() {
- return RaftState.Candidate;
+ return this;
}
@Override
- public RaftState handleMessage(ActorRef sender, Object originalMessage) {
+ public RaftActorBehavior handleMessage(ActorRef sender, Object message) {
+ if (message instanceof ElectionTimeout) {
+ LOG.debug("{}: Received ElectionTimeout", logName());
- Object message = fromSerializableMessage(originalMessage);
+ if (votesRequired == 0) {
+ // If there are no peers then we should be a Leader
+ // We wait for the election timeout to occur before declare
+ // ourselves the leader. This gives enough time for a leader
+ // who we do not know about (as a peer)
+ // to send a message to the candidate
+
+ return internalSwitchBehavior(RaftState.Leader);
+ }
+
+ startNewTerm();
+ scheduleElection(electionDuration());
+ return this;
+ }
if (message instanceof RaftRPC) {
RaftRPC rpc = (RaftRPC) message;
- context.getLogger().debug("RaftRPC message received {} my term is {}", rpc.toString(), context.getTermInformation().getCurrentTerm());
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("{}: RaftRPC message received {}, my term is {}", logName(), rpc,
+ context.getTermInformation().getCurrentTerm());
+ }
// If RPC request or response contains term T > currentTerm:
// set currentTerm = T, convert to follower (§5.1)
// This applies to all RPC messages and responses
if (rpc.getTerm() > context.getTermInformation().getCurrentTerm()) {
context.getTermInformation().updateAndPersist(rpc.getTerm(), null);
- return RaftState.Follower;
- }
- }
- if (message instanceof ElectionTimeout) {
- if (votesRequired == 0) {
- // If there are no peers then we should be a Leader
- // We wait for the election timeout to occur before declare
- // ourselves the leader. This gives enough time for a leader
- // who we do not know about (as a peer)
- // to send a message to the candidate
- return RaftState.Leader;
+ // The raft paper does not say whether or not a Candidate can/should process a RequestVote in
+ // this case but doing so gains quicker convergence when the sender's log is more up-to-date.
+ if (message instanceof RequestVote) {
+ super.handleMessage(sender, message);
+ }
+
+ return internalSwitchBehavior(RaftState.Follower);
}
- startNewTerm();
- scheduleElection(electionDuration());
- return state();
}
return super.handleMessage(sender, message);
@@ -156,31 +184,32 @@ public class Candidate extends AbstractRaftActorBehavior {
// Increment the election term and vote for self
long currentTerm = context.getTermInformation().getCurrentTerm();
- context.getTermInformation().updateAndPersist(currentTerm + 1,
- context.getId());
+ long newTerm = currentTerm + 1;
+ context.getTermInformation().updateAndPersist(newTerm, context.getId());
- context.getLogger().debug("Starting new term " + (currentTerm + 1));
+ LOG.debug("{}: Starting new term {}", logName(), newTerm);
// Request for a vote
// TODO: Retry request for vote if replies do not arrive in a reasonable
// amount of time TBD
- for (String peerId : peers) {
+ for (String peerId : votingPeers) {
ActorSelection peerActor = context.getPeerActorSelection(peerId);
if(peerActor != null) {
- peerActor.tell(new RequestVote(
+ RequestVote requestVote = new RequestVote(
context.getTermInformation().getCurrentTerm(),
context.getId(),
context.getReplicatedLog().lastIndex(),
- context.getReplicatedLog().lastTerm()),
- context.getActor()
- );
- }
- }
+ context.getReplicatedLog().lastTerm());
+ LOG.debug("{}: Sending {} to peer {}", logName(), requestVote, peerId);
+ peerActor.tell(requestVote, context.getActor());
+ }
+ }
}
- @Override public void close() throws Exception {
+ @Override
+ public void close() {
stopElection();
}
}