From: Gu Zhongyan <guzhongyan@360.cn>
Date: Wed, 14 Mar 2018 07:08:05 +0000 (+0800)
Subject: mgr: fix MSG_MGR_MAP handling
X-Git-Tag: v13.1.0~547^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f04190ed11700fd2c701799d2c867cf299a5f1b2;p=ceph.git

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 <guzhongyan@360.cn>
Signed-off-by: yupeng chen chenyupeng-it@360.cn
---

diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc
index 361201db8ff6..5fe51db26db9 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;
 }