diff options
author | Sage Weil <sage@inktank.com> | 2013-07-20 08:46:57 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-07-20 08:46:57 -0700 |
commit | ba5e357e4e6891de33250d4dced820430b795cb0 (patch) | |
tree | 760ef2613b0d217907d11e10f41c020644e1c330 | |
parent | 318f3df718bff735c09851178fa3398bc272dc67 (diff) | |
download | ceph-ba5e357e4e6891de33250d4dced820430b795cb0.tar.gz |
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>
-rw-r--r-- | src/mds/MDS.cc | 7 |
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() |