msgr: debug delay_thread join

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 50656fee53b9d0762692a7c186f35deb339d60a7..66b64d0097a0c155260711cedd998863328d637c 100644 (file)
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -1136,6 +1136,19 @@ void Pipe::unregister_pipe()
   }
 }
 
+void Pipe::join()
+{
+  ldout(msgr->cct, 20) << "join" << dendl;
+  if (writer_thread.is_started())
+    writer_thread.join();
+  if (reader_thread.is_started())
+    reader_thread.join();
+  if (delay_thread) {
+    ldout(msgr->cct, 20) << "joining delay_thread" << dendl;
+    delay_thread->stop();
+    delay_thread->join();
+  }
+}
 
 void Pipe::requeue_sent()
 {

diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h
index 5f94305350c3ed2a8185accc505a313187160f37..6c91395a352f77529002a685d18e93fcf2af8e6a 100644 (file)
--- a/src/msg/Pipe.h
+++ b/src/msg/Pipe.h
@@ -234,16 +234,7 @@ class DispatchQueue;
 
     void register_pipe();
     void unregister_pipe();
-    void join() {
-      if (writer_thread.is_started())
-        writer_thread.join();
-      if (reader_thread.is_started())
-        reader_thread.join();
-      if (delay_thread) {
-       delay_thread->stop();
-       delay_thread->join();
-      }
-    }
+    void join();
     void stop();
 
     void _send(Message *m) {