]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
AsyncMessenger: Don't need to join thread if not started 4401/head
authorHaomai Wang <haomaiwang@gmail.com>
Fri, 24 Apr 2015 13:18:50 +0000 (21:18 +0800)
committerHaomai Wang <haomaiwang@gmail.com>
Fri, 24 Apr 2015 13:18:50 +0000 (21:18 +0800)
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
src/msg/async/AsyncMessenger.cc

index 6d140ceb76ac92f2ae8ebdf365422a9fbe3fc433..2697ebe8766f855c456bdb8243a8e3d1c6d916a9 100644 (file)
@@ -339,8 +339,10 @@ WorkerPool::WorkerPool(CephContext *c): cct(c), seq(0), started(false),
 WorkerPool::~WorkerPool()
 {
   for (uint64_t i = 0; i < workers.size(); ++i) {
-    workers[i]->stop();
-    workers[i]->join();
+    if (workers[i]->is_started()) {
+      workers[i]->stop();
+      workers[i]->join();
+    }
     delete workers[i];
   }
 }