From 7472219695b53028e208e705bede76b74779d21d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 2 May 2019 14:32:09 -0500 Subject: [PATCH] osd: minor cleanup in dequeue_op Signed-off-by: Sage Weil --- src/osd/OSD.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index d1a8e7b754e..4ca945c50a3 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -9730,16 +9730,19 @@ void OSD::dequeue_op( PGRef pg, OpRequestRef op, ThreadPool::TPHandle &handle) { + const Message *m = op->get_req(); + FUNCTRACE(cct); - OID_EVENT_TRACE_WITH_MSG(op->get_req(), "DEQUEUE_OP_BEGIN", false); + OID_EVENT_TRACE_WITH_MSG(m, "DEQUEUE_OP_BEGIN", false); utime_t now = ceph_clock_now(); op->set_dequeued_time(now); - utime_t latency = now - op->get_req()->get_recv_stamp(); - dout(10) << "dequeue_op " << op << " prio " << op->get_req()->get_priority() - << " cost " << op->get_req()->get_cost() + + utime_t latency = now - m->get_recv_stamp(); + dout(10) << "dequeue_op " << op << " prio " << m->get_priority() + << " cost " << m->get_cost() << " latency " << latency - << " " << *(op->get_req()) + << " " << *m << " pg " << *pg << dendl; logger->tinc(l_osd_op_before_dequeue_op_lat, latency); @@ -9759,7 +9762,7 @@ void OSD::dequeue_op( // finish dout(10) << "dequeue_op " << op << " finish" << dendl; - OID_EVENT_TRACE_WITH_MSG(op->get_req(), "DEQUEUE_OP_END", false); + OID_EVENT_TRACE_WITH_MSG(m, "DEQUEUE_OP_END", false); } -- 2.39.5