mon: MDSMonitor: use op-related no_reply()

Signed-off-by: Joao Eduardo Luis <joao@suse.de>

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 91d6cfbaad9afe22394bf2695002821c4ff823f3..d588e14c304d77f236553da576ee5174b5163cee 100644 (file)
--- 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 b840b1e7c2e99246d27d378ec5ab60e28f479599..03a22764b7099799dddfc241f45a39b382184676 100644 (file)
--- 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<PaxosServiceMessage>());
+       mm->mon->no_reply(op);
       } else {
        mm->dispatch(op);        // try again
       }

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3f80242862aaa334219c3c9eec36c10b7b850250..a4bab5dd504a7eb5a29115b3bc75877f98ff55e1 100644 (file)
--- 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<MOSDFailure>();
-       send_latest(o, m->get_epoch());
+        if (o) {
+          o->mark_event(__func__);
+          MOSDFailure *m = o->get_req<MOSDFailure>();
+          send_latest(o, m->get_epoch());
+        }
        ls.pop_front();
       }
     }