From 30a17441f5030ac5c1227a9672811f88e580b4b2 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Oct 2014 14:45:11 -0700
Subject: [PATCH] msg/Pipe: discard delay queue before incoming queue

Shutdown the delayed delivery before the incoming queue in case the
DelayedDelivery thread is busy queuing messages.

Fixes: #9910
Signed-off-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit f7431cc3c25878057482007beb874c9d4473883e)
---
 src/msg/Pipe.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index fc16f459b48..fb880f7fdee 100644
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -1337,9 +1337,9 @@ void Pipe::fault(bool onread)
     unregister_pipe();
     msgr->lock.Unlock();
 
-    in_q->discard_queue(conn_id);
     if (delay_thread)
       delay_thread->discard();
+    in_q->discard_queue(conn_id);
     discard_out_queue();
 
     // disconnect from Connection, and mark it failed.  future messages
-- 
2.47.3