break loop in unreportedAdminThread_ if the sever being stopped

vesoft-inc · Oct 8, 2021 · 90d02b3 · 90d02b3
1 parent c1933dc
commit 90d02b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/storage/admin/AdminTaskManager.cpp b/src/storage/admin/AdminTaskManager.cpp
@@ -45,6 +45,7 @@ void AdminTaskManager::handleUnreportedTasks() {
     while (true) {
       std::unique_lock<std::mutex> lk(unreportedMutex_);
       if (!ifAny) unreportedCV_.wait(lk);
+      if (stopped_.load(std::memory_order_acquire)) break;
       ifAny = false;
       std::unique_ptr<kvstore::KVIterator> iter;
       auto kvRet = env_->adminStore_->scan(&iter);
@@ -119,6 +120,7 @@ void AdminTaskManager::handleUnreportedTasks() {
       }
       env_->adminStore_->multiRemove(keys);
     }
+    LOG(INFO) << "Unreported-Admin-Thread stopped";
   }));
 }
 
@@ -177,6 +179,9 @@ void AdminTaskManager::shutdown() {
   }
 
   pool_->join();
+  stopped_.store(true, std::memory_order_release);
+  notifyReporting();
+  if (unreportedAdminThread_ != nullptr) unreportedAdminThread_->join();
   LOG(INFO) << "exit AdminTaskManager::shutdown()";
 }
 

diff --git a/src/storage/admin/AdminTaskManager.h b/src/storage/admin/AdminTaskManager.h
@@ -77,6 +77,7 @@ class AdminTaskManager {
   std::unique_ptr<std::thread> unreportedAdminThread_;
   std::mutex unreportedMutex_;
   std::condition_variable unreportedCV_;
+  std::atomic<bool> stopped_ = false;
 };
 
 }  // namespace storage