msg/Pipe: unregister pipe immediately on fault; fix mark_down

This fixes a problem where:

 - pipe faults, con->pipe is cleared
 - ms_handle_reset tries to mark_down, but it doesn't know the pipe

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

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index f81f39c7cc8d6353bffd4eee0324fc3b0eb5c56c..ce2ee1684e9cf86366f5cb35258d5bf82b54c5b8 100644 (file)
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -990,14 +990,21 @@ void Pipe::fault(bool onconnect, bool onread)
 
     stop();
 
+    // ugh
+    pipe_lock.Unlock();
+    msgr->lock.Lock();
+    pipe_lock.Lock();
+    unregister_pipe();
+    msgr->lock.Unlock();
+
+    in_q->discard_queue();
+    discard_queue();
+
     // disconnect from Connection, and mark it failed.  future messages
     // will be dropped.
     assert(connection_state);
     connection_state->clear_pipe(this);
 
-    in_q->discard_queue();
-    discard_queue();
-
     msgr->dispatch_queue.queue_reset(connection_state);
     return;
   }