From 038005464525607ceab14b55ee7229b522053f8f Mon Sep 17 00:00:00 2001
From: Greg Farnum <gfarnum@redhat.com>
Date: Thu, 11 Feb 2016 15:25:32 -0800
Subject: [PATCH] mds: don't double-shutdown the timer when suiciding

Fixes: #14697

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---
 src/mds/MDSDaemon.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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();
-- 
2.47.3