summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mds/MDS.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index a867961ccf3..e70d6fd4dff 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()