From: Haomai Wang <haomaiwang@gmail.com>
Date: Fri, 24 Apr 2015 13:18:50 +0000 (+0800)
Subject: AsyncMessenger: Don't need to join thread if not started
X-Git-Tag: v9.0.1~74^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4401%2Fhead;p=ceph.git

AsyncMessenger: Don't need to join thread if not started

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index 6d140ceb76ac..2697ebe8766f 100644
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -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];
   }
 }