Fix rare race condition on commit cv (#187)

eBay · Mar 25, 2021 · 2df09cc · 2df09cc
1 parent 3f7708b
commit 2df09cc
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/handle_commit.cxx b/src/handle_commit.cxx
@@ -106,8 +106,12 @@ void raft_server::commit_in_bg() {
                 sm_commit_index_ >= log_store_->next_slot() - 1 ) {
             std::unique_lock<std::mutex> lock(commit_cv_lock_);
 
+            auto wait_check = [this] () {
+                return (log_store_->next_slot() - 1 > sm_commit_index_ &&
+                        quick_commit_index_ > sm_commit_index_) || stopping_;
+            };
             p_tr("commit_cv_ sleep\n");
-            commit_cv_.wait(lock);
+            commit_cv_.wait(lock, wait_check);
 
             p_tr("commit_cv_ wake up\n");
             if (stopping_) {