mon: use send_reply for MPoolOpReply

diff --git a/src/TODO b/src/TODO
index 0e790a1f21b32ad0da43ac4771668e90f9842fde..d9cfcac7cf92f022b1ffaba0900022a03724306f 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -44,12 +44,10 @@ v0.17
 - kclient: retry alloc on ENOMEM when reading from connection?
 
 - kill mon->osd
-  - kill shutdown msg
   - notify random osd when a map commits?
+  - how to tell osds to scrub?
   - send map on MPGStats, sometimes?
-- kill mon->mds
-  - beacon reply
-  - kill shutdown msg
+  - pg creates?
 
 - simplify msgr failure model
    mon<->mon lossless, p2p

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 66cf62de4cbb3ef748b14ac470557caf0c33f732..a795443ee6e8537d3aed8facca049f0fa9d5b768 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -150,8 +150,6 @@ void OSDMonitor::encode_pending(bufferlist &bl)
        i != pending_inc.new_down.end();
        i++) {
     dout(2) << " osd" << i->first << " DOWN clean=" << (int)i->second << dendl;
-    // no: this screws up map delivery on shutdown
-    //mon->messenger->mark_down(osdmap.get_addr(i->first));
   }
   for (map<int32_t,entity_addr_t>::iterator i = pending_inc.new_up.begin();
        i != pending_inc.new_up.end(); 
@@ -1316,7 +1314,7 @@ bool OSDMonitor::prepare_pool_op_create (MPoolOp *m)
 void OSDMonitor::_pool_op(MPoolOp *m, int replyCode, epoch_t epoch)
 {
   MPoolOpReply *reply = new MPoolOpReply(m->fsid, m->tid,
-                                            replyCode, epoch, mon->get_epoch());
-  mon->messenger->send_message(reply, m->get_orig_source_inst());
+                                        replyCode, epoch, mon->get_epoch());
+  mon->send_reply(m, reply);
   delete m;
 }