diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-20 08:47:20 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-20 08:47:20 -0700 |
| commit | 1fd01e3b5ba36bd1843525de14d2f32c24211c7e (patch) | |
| tree | 6f7935826d5913652b77e3f584de52150ddeac09 | |
| parent | ba5e357e4e6891de33250d4dced820430b795cb0 (diff) | |
| download | ceph-1fd01e3b5ba36bd1843525de14d2f32c24211c7e.tar.gz | |
mon: shutdown: remove sessions under mon->lock
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/mon/Monitor.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 90750dd7b11..6c943832ac1 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. } |