From: Sage Weil <sage@redhat.com>
Date: Tue, 4 Dec 2018 04:09:40 +0000 (-0600)
Subject: mon/OSDMonitor: do not no_reply on ready_to_merge message
X-Git-Tag: v14.1.0~728^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe90c6103171b883275bfc23fe0c74f3c24a1b95;p=ceph.git

mon/OSDMonitor: do not no_reply on ready_to_merge message

The C_ReplyMap will reply to this op.  Do not no_reply, or else an
ill-timed mon election will mean we do nothing for this request.

Fixes: http://tracker.ceph.com/issues/37512
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c38d03324a6e..246731c302bf 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3326,7 +3326,6 @@ bool OSDMonitor::prepare_pg_ready_to_merge(MonOpRequestRef op)
   } else {
     wait_for_finished_proposal(op, new C_ReplyMap(this, op, m->version));
   }
-  mon->no_reply(op);
   return true;
 }