From 28ef26bf8a5bf572289cf82b2e99ac8ff3ff06ec Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Fri, 25 Oct 2019 09:57:29 +1000 Subject: [PATCH] msg/DispatchQueue: Set throttle stamp for local_delivery 33d8efa52d changed to initialising TrackedOps with the throttle stamp. This exposed the fact the throttle stamp and recieve complete stamp were not being set for local delivery. Fixes: https://tracker.ceph.com/issues/41834 Signed-off-by: Brad Hubbard --- src/msg/DispatchQueue.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/msg/DispatchQueue.cc b/src/msg/DispatchQueue.cc index ad543fb6301..5a081591a59 100644 --- a/src/msg/DispatchQueue.cc +++ b/src/msg/DispatchQueue.cc @@ -96,7 +96,10 @@ void DispatchQueue::enqueue(const ref_t& m, int priority, uint64_t id) void DispatchQueue::local_delivery(const ref_t& m, int priority) { - m->set_recv_stamp(ceph_clock_now()); + auto local_delivery_stamp = ceph_clock_now(); + m->set_recv_stamp(local_delivery_stamp); + m->set_throttle_stamp(local_delivery_stamp); + m->set_recv_complete_stamp(local_delivery_stamp); std::lock_guard l{local_delivery_lock}; if (local_messages.empty()) local_delivery_cond.notify_all(); -- 2.39.5