]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon/OSDMonitor: do not no_reply on ready_to_merge message
authorSage Weil <sage@redhat.com>
Tue, 4 Dec 2018 04:09:40 +0000 (22:09 -0600)
committerSage Weil <sage@redhat.com>
Tue, 4 Dec 2018 04:09:47 +0000 (22:09 -0600)
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>
src/mon/OSDMonitor.cc

index c38d03324a6eadd3f9b8303de7b59db69924c068..246731c302bfb25b55f9255f60bfb161b8f9a5a8 100644 (file)
@@ -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;
 }