osd: set reqid on push/pull ops

Not strictly necessary, but makes logs easier to follow.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 267c3b20f4aa93093138dbdb6c10c9980fac80e7..59fdd1c18c119836e344897ad148087f6c4fe780 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3725,8 +3725,8 @@ void ReplicatedPG::send_pull_op(const hobject_t& soid, eversion_t v, bool first,
                                const interval_set<uint64_t>& data_subset, int fromosd)
 {
   // send op
-  osd_reqid_t rid;
   tid_t tid = osd->get_tid();
+  osd_reqid_t rid(osd->cluster_messenger->get_myname(), 0, tid);
 
   dout(10) << "send_pull_op " << soid << " " << v
           << " first=" << first
@@ -3901,9 +3901,10 @@ int ReplicatedPG::send_push_op(const hobject_t& soid, eversion_t version, int pe
   osd->logger->inc(l_osd_push_outb, bl.length());
   
   // send
-  osd_reqid_t rid;  // useless?
+  tid_t tid = osd->get_tid();
+  osd_reqid_t rid(osd->cluster_messenger->get_myname(), 0, tid);
   MOSDSubOp *subop = new MOSDSubOp(rid, info.pgid, soid, false, 0,
-                                  osd->osdmap->get_epoch(), osd->get_tid(), oi.version);
+                                  osd->osdmap->get_epoch(), tid, oi.version);
   subop->oloc = oi.oloc;
   subop->ops = vector<OSDOp>(1);
   subop->ops[0].op.op = CEPH_OSD_OP_PUSH;
@@ -3924,9 +3925,10 @@ int ReplicatedPG::send_push_op(const hobject_t& soid, eversion_t version, int pe
 void ReplicatedPG::send_push_op_blank(const hobject_t& soid, int peer)
 {
   // send a blank push back to the primary
-  osd_reqid_t rid;
+  tid_t tid = osd->get_tid();
+  osd_reqid_t rid(osd->cluster_messenger->get_myname(), 0, tid);
   MOSDSubOp *subop = new MOSDSubOp(rid, info.pgid, soid, false, 0,
-                                  osd->osdmap->get_epoch(), osd->get_tid(), eversion_t());
+                                  osd->osdmap->get_epoch(), tid, eversion_t());
   subop->ops = vector<OSDOp>(1);
   subop->ops[0].op.op = CEPH_OSD_OP_PUSH;
   subop->first = false;