From f04190ed11700fd2c701799d2c867cf299a5f1b2 Mon Sep 17 00:00:00 2001 From: Gu Zhongyan Date: Wed, 14 Mar 2018 15:08:05 +0800 Subject: [PATCH] mgr: fix MSG_MGR_MAP handling ceph config show mgr.x doesn't work root cause is mgr daemon's mgrc has no chance to process MSG_MGR_MAP in the mgr daemon's ms_dispatch. fix is let this message pass through for mgrc Signed-off-by: Gu Zhongyan Signed-off-by: yupeng chen chenyupeng-it@360.cn --- src/mgr/MgrStandby.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc index 361201db8ff63..5fe51db26db90 100644 --- a/src/mgr/MgrStandby.cc +++ b/src/mgr/MgrStandby.cc @@ -409,9 +409,9 @@ bool MgrStandby::ms_dispatch(Message *m) handled = am->ms_dispatch(m); lock.Lock(); } - if (m->get_type() == MSG_MGR_MAP && !handled) { - m->put(); - handled = true; + if (m->get_type() == MSG_MGR_MAP) { + // let this pass through for mgrc + handled = false; } return handled; } -- 2.39.5