From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 16 Feb 2018 23:44:22 +0000 (-0800)
Subject: mon: mark manager beacons as no_reply
X-Git-Tag: v12.2.5~73^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70dce16a6ee9a849f6a1c29053a9d79ed1a2a025;p=ceph.git

mon: mark manager beacons as no_reply

We never reply to manager beacons, and we have to mark them
that way or else forwarded messages pile up pending replies
and things eventually block.

Fixes: http://tracker.ceph.com/issues/22114
Reported-by: Hongpeng Lu <ludehp@163.com>

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 57ecc1ef1c1d4df973517c71ba02e5d1a16fb9c1)
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 459197ffeb2b..900aa5fce76e 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -278,6 +278,7 @@ public:
 bool MgrMonitor::preprocess_beacon(MonOpRequestRef op)
 {
   MMgrBeacon *m = static_cast<MMgrBeacon*>(op->get_req());
+  mon->no_reply(op); // we never reply to beacons
   dout(4) << "beacon from " << m->get_gid() << dendl;
 
   if (!check_caps(op, m->get_fsid())) {