]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
AsyncMessenger: Avoid join when worker thread not started
authorHaomai Wang <haomaiwang@gmail.com>
Tue, 30 Sep 2014 16:01:57 +0000 (00:01 +0800)
committerHaomai Wang <haomaiwang@gmail.com>
Wed, 8 Oct 2014 07:52:34 +0000 (15:52 +0800)
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
src/msg/AsyncMessenger.cc

index 0a7f82b8068828e375e3dbf8f63197b91f5fde61..ed8f04fcaaa672d497bfc125888285a97ded77ea 100644 (file)
@@ -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();