From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Wed, 21 Jan 2015 14:38:24 +0000 (+0100)
Subject: mds: don't join on thread which has not been runned.
X-Git-Tag: v0.93~169^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e236a37696914e152902ec4ca9ddfa2190af66d;p=ceph.git

mds: don't join on thread which has not been runned.

Fixes: #10550
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 387eda18ffa3..13146bfcc079 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -2990,7 +2990,8 @@ void MDS::ProgressThread::shutdown()
   stopping = true;
   cond.Signal();
   mds->mds_lock.Unlock();
-  join();
+  if (is_started())
+    join();
   mds->mds_lock.Lock();
 }