fix RequestVote bug. the leader will not become follower when network…

… partition, and the candidate's log is smaller than leader but the candidate has larger term
PikaLabs · Aug 29, 2017 · ed66972 · ed66972
1 parent 01b71a6
commit ed66972
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 119 deletions.
diff --git a/floyd/src/floyd_impl.cc b/floyd/src/floyd_impl.cc
@@ -587,6 +587,13 @@ void FloydImpl::ReplyRequestVote(const CmdRequest& request, CmdResponse* respons
   CmdRequest_RequestVote request_vote = request.request_vote();
   LOGV(DEBUG_LEVEL, info_log_, "FloydImpl::ReplyRequestVote: my_term=%lu request.term=%lu",
        context_->current_term, request_vote.term());
+  /*
+   * If RPC request or response contains term T > currentTerm: set currentTerm = T, convert to follower (§5.1)
+   */
+  if (request_vote.term() > context_->current_term) {
+    context_->BecomeFollower(request_vote.term());
+    raft_meta_->SetCurrentTerm(context_->current_term);
+  }
   // if caller's term smaller than my term, then I will notice him
   if (request_vote.term() < context_->current_term) {
     LOGV(INFO_LEVEL, info_log_, "FloydImpl::ReplyRequestVote: Leader %s:%d term %lu is smaller than my %s:%d current term %lu",

diff --git a/floyd/test/start_all.sh b/floyd/test/start_all.sh
diff --git a/floyd/test/stop_all.sh b/floyd/test/stop_all.sh
diff --git a/floyd/test/test0.sh b/floyd/test/test0.sh
diff --git a/floyd/test/test1.sh b/floyd/test/test1.sh