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>
(cherry picked from commit 0a32f55629c62a38ae3f0923b90a74dfd7f4b1d5)

diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index 12cb451c0a28bf399e0f66a9673b9b0d234463cb..ec9031dbce365e3a6e473341534b74f6d5ed5c05 100644 (file)
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -191,8 +191,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 59889fc533f69666396d3f92df09789b9742e590..ba77dc3ba281d5767c3f6db111d6c985d8d37937 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),