From ba5e357e4e6891de33250d4dced820430b795cb0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 20 Jul 2013 08:46:57 -0700 Subject: [PATCH] mds: reorder suicide/shutdown a bit * shutdown msgr last * stop timer quickly, in case there are other events Signed-off-by: Sage Weil --- src/mds/MDS.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index a867961ccf3aa..e70d6fd4dff8f 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() -- 2.39.5