From: Sage Weil <sage@inktank.com>
Date: Mon, 2 Jul 2012 00:23:28 +0000 (-0700)
Subject: msgr: restart_queue when replacing existing pipe and taking over the queue
X-Git-Tag: v0.49~50^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7d4e39740fd2afe82ac40c711bd3fe7a282e816;p=ceph.git

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 06f0bc84950b..53e36cd7ef2d 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);