From: Sage Weil <sage@redhat.com>
Date: Sun, 27 May 2018 14:49:37 +0000 (-0500)
Subject: mon/OSDMonitor: no_reply on ignored MOSDFailure
X-Git-Tag: v13.2.1~101^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c78c7c01160e942fbe4b67a59930cae1080a795f;p=ceph.git

mon/OSDMonitor: no_reply on ignored MOSDFailure

If we are ignoring the message, tell the forwarding mon to discard it's
state.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 244c8dbf1b2..c415c8ae70f 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2176,6 +2176,7 @@ bool OSDMonitor::preprocess_failure(MonOpRequestRef op)
   return false;
 
  didit:
+  mon->no_reply(op);
   return true;
 }