From 1fd01e3b5ba36bd1843525de14d2f32c24211c7e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 20 Jul 2013 08:47:20 -0700 Subject: [PATCH] mon: shutdown: remove sessions under mon->lock Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 90750dd7b1167..6c943832ac1c3 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -605,13 +605,13 @@ void Monitor::shutdown() finish_contexts(g_ceph_context, waitfor_quorum, -ECANCELED); finish_contexts(g_ceph_context, maybe_wait_for_quorum, -ECANCELED); - timer.shutdown(); + remove_all_sessions(); + // unlock before msgr shutdown... lock.Unlock(); - remove_all_sessions(); messenger->shutdown(); // last thing! ceph_mon.cc will delete mon. } -- 2.39.5