osd/TrackedOp: Fix TrackedOp event order

Header_read time is recv_stap, throttled time is
throttle_stamp. Throttled event is in front of header_read
event currently, but throttle_stamp is behind recv_stamp.

Initiated time should be recv_stap, instead of throttle_stamp.

Fixes: https://tracker.ceph.com/issues/61388
Signed-off-by: YiteGu <yitegu0@gmail.com>

diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index 0ff7430b372b5b279919f45e106498ffe0bbf032..31afba1853e3af3691d0247608f8e90cc231dc6f 100644 (file)
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -206,8 +206,8 @@ public:
     typename T::Ref retval(new T(params, this));
     retval->tracking_start();
     if (is_tracking()) {
-      retval->mark_event("throttled", params->get_throttle_stamp());
       retval->mark_event("header_read", params->get_recv_stamp());
+      retval->mark_event("throttled", params->get_throttle_stamp());
       retval->mark_event("all_read", params->get_recv_complete_stamp());
       retval->mark_event("dispatched", params->get_dispatch_stamp());
     }

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index cd62c922d6d45b96e9c9f9889400a2ef9c5f5cfd..1524b07c4ebad952680e772c0ad51b6ee893314f 100644 (file)
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -31,7 +31,7 @@ using std::stringstream;
 using ceph::Formatter;
 
 OpRequest::OpRequest(Message* req, OpTracker* tracker)
-    : TrackedOp(tracker, req->get_throttle_stamp()),
+    : TrackedOp(tracker, req->get_recv_stamp()),
       request(req),
       hit_flag_points(0),
       latest_flag_point(0),