From dce78ee124186886f7140e832c8afacc3c2456e2 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Wed, 24 Jun 2015 23:49:54 +0100 Subject: [PATCH] mon: MDSMonitor: use op-related no_reply() Signed-off-by: Joao Eduardo Luis --- src/mon/MDSMonitor.cc | 2 +- src/mon/MDSMonitor.h | 2 +- src/mon/OSDMonitor.cc | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 91d6cfbaad9af..d588e14c304d7 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -370,7 +370,7 @@ bool MDSMonitor::preprocess_beacon(MonOpRequestRef op) ignore: // I won't reply this beacon, drop it. - mon->no_reply(m); + mon->no_reply(op); return true; } diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h index b840b1e7c2e99..03a22764b7099 100644 --- a/src/mon/MDSMonitor.h +++ b/src/mon/MDSMonitor.h @@ -59,7 +59,7 @@ class MDSMonitor : public PaxosService { if (r >= 0) mm->_updated(op); // success else if (r == -ECANCELED) { - mm->mon->no_reply(op->get_req()); + mm->mon->no_reply(op); } else { mm->dispatch(op); // try again } diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 3f80242862aaa..a4bab5dd504a7 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1758,9 +1758,11 @@ void OSDMonitor::process_failures() while (!ls.empty()) { MonOpRequestRef o = ls.front(); - o->mark_event(__func__); - MOSDFailure *m = o->get_req(); - send_latest(o, m->get_epoch()); + if (o) { + o->mark_event(__func__); + MOSDFailure *m = o->get_req(); + send_latest(o, m->get_epoch()); + } ls.pop_front(); } } -- 2.39.5