fix deadlock

vesoft-inc · Nov 9, 2021 · 74ceaea · 74ceaea
1 parent 272940e
commit 74ceaea
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/kvstore/raftex/RaftPart.cpp b/src/kvstore/raftex/RaftPart.cpp
@@ -1129,27 +1129,29 @@ folly::Future<bool> RaftPart::leaderElection() {
 
 bool RaftPart::handleElectionResponses(const cpp2::AskForVoteRequest& voteReq,
                                        const ElectionResponses& resps,
-                                       const std::vector<std::shared_ptr<Host>>& hosts,
+                                       const std::vector<std::shared_ptr<Host>>& peers,
                                        TermID proposedTerm) {
   // Process the responses
-  switch (processElectionResponses(resps, std::move(hosts), proposedTerm)) {
+  switch (processElectionResponses(resps, std::move(peers), proposedTerm)) {
     case Role::LEADER: {
       // Elected
       LOG(INFO) << idStr_ << "The partition is elected as the leader";
+      std::vector<std::shared_ptr<Host>> hosts;
       {
         std::lock_guard<std::mutex> g(raftLock_);
         if (status_ == Status::RUNNING) {
           leader_ = addr_;
-          for (auto& host : hosts_) {
-            host->reset();
-          }
+          hosts = hosts_;
           bgWorkers_->addTask(
               [self = shared_from_this(), term = voteReq.get_term()] { self->onElected(term); });
           lastMsgAcceptedTime_ = 0;
         }
         weight_ = 1;
         commitInThisTerm_ = false;
       }
+      for (auto& host : hosts) {
+        host->reset();
+      }
       sendHeartbeat();
       return true;
     }