]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: no_reply on MOSDFailure ops we eventually process 22297/head
authorSage Weil <sage@redhat.com>
Sun, 27 May 2018 14:55:04 +0000 (09:55 -0500)
committerKefu Chai <kchai@redhat.com>
Tue, 29 May 2018 13:09:54 +0000 (21:09 +0800)
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)

src/mon/OSDMonitor.cc

index c415c8ae70f9ce6e19f4829e04766a40310a1419..1f90bc97dccbaeeef66ff2208f83a310d7f9ae1b 100644 (file)
@@ -2561,6 +2561,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();
       }