From: Haomai Wang <haomaiwang@gmail.com>
Date: Tue, 30 Sep 2014 16:01:57 +0000 (+0800)
Subject: AsyncMessenger: Avoid join when worker thread not started
X-Git-Tag: v0.88~37^2~4^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e25f2fea2ca855821aeec4e0af481d086e240f59;p=ceph.git

AsyncMessenger: Avoid join when worker thread not started

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

diff --git a/src/msg/AsyncMessenger.cc b/src/msg/AsyncMessenger.cc
index 0a7f82b80688..ed8f04fcaaa6 100644
--- a/src/msg/AsyncMessenger.cc
+++ b/src/msg/AsyncMessenger.cc
@@ -375,7 +375,8 @@ int AsyncMessenger::rebind(const set<int>& avoid_ports)
   assert(did_bind);
   for (vector<Worker*>::iterator it = workers.begin(); it != workers.end(); ++it) {
     (*it)->stop();
-    (*it)->join();
+    if ((*it)->is_started())
+      (*it)->join();
   }
 
   processor.stop();