]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: don't double-shutdown the timer when suiciding 7616/head
authorGreg Farnum <gfarnum@redhat.com>
Thu, 11 Feb 2016 23:25:32 +0000 (15:25 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Thu, 11 Feb 2016 23:26:20 +0000 (15:26 -0800)
Fixes: #14697
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/mds/MDSDaemon.cc

index 62d37c979a92109456c083313e789a9e56fcddc6..cdabf7c7c5b363fa7d8da892e270b8446ec2e27e 100644 (file)
@@ -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();