From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Feb 2018 18:48:38 +0000 (-0600)
Subject: msg/DispatchQueue: prevent queueing of new messages after shutdown
X-Git-Tag: v13.0.2~218^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33665bfe9f970884dbb4d4faad8f31cf76d9810e;p=ceph.git

msg/DispatchQueue: prevent queueing of new messages after shutdown

The other queue_* methods check stop; enqueue() did not.

Fixes: http://tracker.ceph.com/issues/18351
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/msg/DispatchQueue.cc b/src/msg/DispatchQueue.cc
index 263e81f85b4..29c5429b0e0 100644
--- a/src/msg/DispatchQueue.cc
+++ b/src/msg/DispatchQueue.cc
@@ -81,6 +81,10 @@ void DispatchQueue::enqueue(Message *m, int priority, uint64_t id)
 {
 
   Mutex::Locker l(lock);
+  if (stop) {
+    m->put();
+    return;
+  }
   ldout(cct,20) << "queue " << m << " prio " << priority << dendl;
   add_arrival(m);
   if (priority >= CEPH_MSG_PRIO_LOW) {