From: Sage Weil <sage@inktank.com>
Date: Mon, 17 Jun 2013 19:47:11 +0000 (-0700)
Subject: msgr: clear_pipe inside pipe_lock on mark_down_all
X-Git-Tag: v0.66~32^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5fc1dabfb3b2cbffdee3214d24d7769d6e440e45;p=ceph.git

msgr: clear_pipe inside pipe_lock on mark_down_all

Observed a segfault in rebind -> mark_down_all -> clear_pipe -> put that
may have been due to a racing thread clearing the connection_state pointer.
Do the clear_pipe() call under the protection of pipe_lock, as we do in
all other contexts.

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

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index f1e614628df1..994f849c1eb2 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -563,9 +563,9 @@ void SimpleMessenger::mark_down_all()
     p->pipe_lock.Lock();
     p->stop();
     ConnectionRef con = p->connection_state;
-    p->pipe_lock.Unlock();
     if (con && con->clear_pipe(p))
       dispatch_queue.queue_reset(con.get());
+    p->pipe_lock.Unlock();
   }
   lock.Unlock();
 }