msgr: restart_queue when replacing existing pipe and taking over the queue

The queue may have been previously stopped (by discard_queue()), and needs
to be restarted.

Fixes consistent failures from the mon_recovery.py integration tests.

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

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 06f0bc84950bf3c731878d8f15654cbe7b348bae..53e36cd7ef2d836d85d5158435fb6e3decd68e39 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -860,6 +860,7 @@ int SimpleMessenger::Pipe::accept()
     in_q = existing->in_q;
     in_q->lock.Lock();
     in_q->pipe = this;
+    in_q->restart_queue();
     in_q->lock.Unlock();
     existing->in_q = new IncomingQueue(msgr->cct, existing);