Merge pull request #3441 from peat-psuwit/for-upstream/dbqueue-stop-mutex

db: fix dead lock in zmDbQueue::stop()
2022-02-20 10:32:19 -05:00 · 2022-02-20 10:32:19 -05:00 · f4412c81d1
parent fe69261f10 ebe502a747
commit f4412c81d1
1 changed files with 7 additions and 2 deletions
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@ -238,8 +238,13 @@ zmDbQueue::~zmDbQueue() {
 }

 void zmDbQueue::stop() {
-  mTerminate = true;
-  mCondition.notify_all();
+  {
+    std::unique_lock<std::mutex> lock(mMutex);
+
+    mTerminate = true;
+    mCondition.notify_all();
+  }
+
  if (mThread.joinable()) mThread.join();
 }