From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 11 Feb 2016 23:25:32 +0000 (-0800)
Subject: mds: don't double-shutdown the timer when suiciding
X-Git-Tag: v10.1.0~374^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=038005464525607ceab14b55ee7229b522053f8f;p=ceph.git

mds: don't double-shutdown the timer when suiciding

Fixes: #14697

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
index 62d37c979a92..cdabf7c7c5b3 100644
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@ -1092,8 +1092,6 @@ void MDSDaemon::suicide()
   }
   beacon.shutdown();
 
-  timer.shutdown();
-
   if (mds_rank) {
     mds_rank->shutdown();
   } else {
@@ -1101,6 +1099,7 @@ void MDSDaemon::suicide()
     if (objecter->initialized.read()) {
       objecter->shutdown();
     }
+    timer.shutdown();
 
     monc->shutdown();
     messenger->shutdown();