From f7d4e39740fd2afe82ac40c711bd3fe7a282e816 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 1 Jul 2012 17:23:28 -0700 Subject: [PATCH] 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 --- src/msg/SimpleMessenger.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 06f0bc84950bf..53e36cd7ef2d8 100644 --- 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); -- 2.39.5