From 0a32f55629c62a38ae3f0923b90a74dfd7f4b1d5 Mon Sep 17 00:00:00 2001 From: "yite.gu" Date: Fri, 12 May 2023 05:29:26 -0400 Subject: [PATCH] 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 --- src/common/TrackedOp.h | 2 +- src/osd/OpRequest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h index 0ff7430b372b..31afba1853e3 100644 --- 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 cd62c922d6d4..1524b07c4eba 100644 --- 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), -- 2.47.3