]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: mark mgr reports and osd_failure as no_reply 21057/head
authorKefu Chai <kchai@redhat.com>
Tue, 27 Mar 2018 09:45:30 +0000 (17:45 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 27 Mar 2018 13:04:18 +0000 (21:04 +0800)
see also: #20517

Fixes: http://tracker.ceph.com/issues/22114
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/mon/MgrStatMonitor.cc
src/mon/OSDMonitor.cc

index 8c55628975f1fee4c5127ffeeaf284b4078d2f81..18b8bd5e24aadac67695f2ca545602f2b2e64311 100644 (file)
@@ -175,6 +175,7 @@ bool MgrStatMonitor::prepare_update(MonOpRequestRef op)
 
 bool MgrStatMonitor::preprocess_report(MonOpRequestRef op)
 {
+  mon->no_reply(op);
   return false;
 }
 
index 2ec3541a08aa0e4f0f67c2b761e1a505c7e52f36..d028204edb72c6d6b131267af797479805d8f6db 100644 (file)
@@ -2106,6 +2106,7 @@ bool OSDMonitor::prepare_failure(MonOpRequestRef op)
       mon->clog->debug() << m->get_target() << " reported immediately failed by "
             << m->get_orig_source_inst();
       force_failure(target_osd, reporter);
+      mon->no_reply(op);
       return true;
     }
     mon->clog->debug() << m->get_target() << " reported failed by "