From: Brad Hubbard <bhubbard@redhat.com>
Date: Thu, 24 Oct 2019 23:57:29 +0000 (+1000)
Subject: msg/DispatchQueue: Set throttle stamp for local_delivery
X-Git-Tag: v15.1.0~1080^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28ef26bf8a5bf572289cf82b2e99ac8ff3ff06ec;p=ceph.git

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 <bhubbard@redhat.com>
---

diff --git a/src/msg/DispatchQueue.cc b/src/msg/DispatchQueue.cc
index ad543fb63011..5a081591a597 100644
--- a/src/msg/DispatchQueue.cc
+++ b/src/msg/DispatchQueue.cc
@@ -96,7 +96,10 @@ void DispatchQueue::enqueue(const ref_t<Message>& m, int priority, uint64_t id)
 
 void DispatchQueue::local_delivery(const ref_t<Message>& 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();