From fc28d29c0c13669208f7af64c57d51c2ef874509 Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 13 Apr 2017 11:00:46 -0400 Subject: [PATCH] mds: fix mgrc shutdown Were previously only tearing MgrClient down when not holding a rank, leading to it trying to continue to run after monclient was shut down. Fixes: http://tracker.ceph.com/issues/19566 Signed-off-by: John Spray --- src/mds/MDSDaemon.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc index 273e5eca7c1..4c3d558ed46 100644 --- a/src/mds/MDSDaemon.cc +++ b/src/mds/MDSDaemon.cc @@ -1014,12 +1014,13 @@ void MDSDaemon::suicide() } beacon.shutdown(); + mgrc.shutdown(); + if (mds_rank) { mds_rank->shutdown(); } else { timer.shutdown(); - mgrc.shutdown(); monc->shutdown(); messenger->shutdown(); } @@ -1101,7 +1102,8 @@ bool MDSDaemon::ms_dispatch(Message *m) bool MDSDaemon::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer, bool force_new) { - dout(10) << "MDSDaemon::ms_get_authorizer type=" << ceph_entity_type_name(dest_type) << dendl; + dout(10) << "MDSDaemon::ms_get_authorizer type=" + << ceph_entity_type_name(dest_type) << dendl; /* monitor authorization is being handled on different layer */ if (dest_type == CEPH_ENTITY_TYPE_MON) -- 2.47.3