fix: add change_peer_mutex_ in PRaft::AddPeer and `PRaft::RemoveP…

…eer` issue: #30 issue: #280 Signed-off-by: HappyUncle <[email protected]>
arana-db · Oct 19, 2024 · 969eae4 · 969eae4
1 parent 42690cc
commit 969eae4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/praft/praft.cc b/src/praft/praft.cc
@@ -532,12 +532,12 @@ int PRaft::ProcessClusterRemoveCmdResponse(PClient* client, const char* start, i
 }
 
 butil::Status PRaft::AddPeer(const std::string& peer) {
-  std::unique_lock<std::mutex> lck(add_peer_mutex_);
-
   if (!node_) {
-    ERROR_LOG_AND_STATUS("Node is not initialized");
+    return ERROR_LOG_AND_STATUS("Node is not initialized");
   }
 
+  std::unique_lock<std::mutex> lck(change_peer_mutex_);
+
   braft::SynchronizedClosure done;
   node_->add_peer(peer, &done);
   done.wait();
@@ -555,6 +555,8 @@ butil::Status PRaft::RemovePeer(const std::string& peer) {
     return ERROR_LOG_AND_STATUS("Node is not initialized");
   }
 
+  std::unique_lock<std::mutex> lck(change_peer_mutex_);
+
   braft::SynchronizedClosure done;
   node_->remove_peer(peer, &done);
   done.wait();

diff --git a/src/praft/praft.h b/src/praft/praft.h
@@ -173,7 +173,7 @@ class PRaft : public braft::StateMachine {
   bool is_node_first_start_up_ = true;
 
   // Concurrency `raft.cluster join` will throw an error, so use a mutex for restriction.
-  std::mutex add_peer_mutex_;
+  std::mutex change_peer_mutex_;
 };
 
 }  // namespace kiwi