From: Sage Weil <sage@inktank.com>
Date: Sat, 20 Jul 2013 15:46:57 +0000 (-0700)
Subject: mds: reorder suicide/shutdown a bit
X-Git-Tag: v0.67-rc2~19^2~9^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba5e357e4e6891de33250d4dced820430b795cb0;p=ceph.git

mds: reorder suicide/shutdown a bit

* shutdown msgr last
* stop timer quickly, in case there are other events

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index a867961ccf3a..e70d6fd4dff8 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -1628,19 +1628,18 @@ void MDS::suicide()
   }
   timer.cancel_all_events();
   //timer.join();
+  timer.shutdown();
   
   // shut down cache
   mdcache->shutdown();
 
   if (objecter->initialized)
     objecter->shutdown_locked();
-  
-  // shut down messenger
-  messenger->shutdown();
 
   monc->shutdown();
 
-  timer.shutdown();
+  // shut down messenger
+  messenger->shutdown();
 }
 
 void MDS::respawn()