]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: don't join on thread which has not been runned. 3514/head
authorRadoslaw Zarzynski <rzarzynski@mirantis.com>
Wed, 21 Jan 2015 14:38:24 +0000 (15:38 +0100)
committerRadoslaw Zarzynski <rzarzynski@mirantis.com>
Wed, 28 Jan 2015 09:28:43 +0000 (10:28 +0100)
Fixes: #10550
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
src/mds/MDS.cc

index 387eda18ffa34bfb7b72bdcc2f7ba315d31adbd5..13146bfcc079c011a278ba39fa45da11d044b519 100644 (file)
@@ -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();
 }