From: Sage Weil <sage@redhat.com>
Date: Sun, 27 May 2018 14:55:04 +0000 (-0500)
Subject: mon/OSDMonitor: no_reply on MOSDFailure ops we eventually process
X-Git-Tag: v12.2.6~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22568%2Fhead;p=ceph.git

mon/OSDMonitor: no_reply on MOSDFailure ops we eventually process

Failure ops get attached to the failure report.  Once we finally process
them, mark them no_reply so that the forwarding mon will know about it.
The other paths through prepare_failure() do no_reply on the messages
that don't get logged in the failure_info_t::reporters.

Fixes: http://tracker.ceph.com/issues/24322
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f6128e5b53cc8a6e1e97a66794806299c5190d3c)
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 2e5f99b736ed..3e10a9db7961 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2257,6 +2257,7 @@ void OSDMonitor::process_failures()
           o->mark_event(__func__);
           MOSDFailure *m = o->get_req<MOSDFailure>();
           send_latest(o, m->get_epoch());
+	  mon->no_reply(o);
         }
 	ls.pop_front();
       }