msg/Pipe: reset replaced pipes

This gives the ms_handle_reset call a chance to clean up (for example, by
breaking a con->priv <-> session reference cycle).

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

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 789f7906254e0d9b0936e17cc710b274985172ae..8b7e479add9234dfa46ddcbde0d1007d863be6ed 100644 (file)
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -564,6 +564,9 @@ int Pipe::accept()
   replaced = true;
 
   if (!existing->policy.lossy) {
+    // queue a reset on the old connection
+    msgr->dispatch_queue.queue_reset(connection_state.get());
+
     // drop my Connection, and take a ref to the existing one. do not
     // clear existing->connection_state, since read_message and
     // write_message both dereference it without pipe_lock.