diff options
author | Sage Weil <sage@inktank.com> | 2013-06-17 12:47:11 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-07-24 16:20:35 -0700 |
commit | 8aafe131acadc22cb069f3d98bba6922ab09c749 (patch) | |
tree | e862ef7f9a665a39ec6af16f45c99cbb877a7424 | |
parent | 2f7979d1262e9d4899be76963a1620db46b334e8 (diff) | |
download | ceph-8aafe131acadc22cb069f3d98bba6922ab09c749.tar.gz |
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>
(cherry picked from commit 5fc1dabfb3b2cbffdee3214d24d7769d6e440e45)
Conflicts:
src/msg/SimpleMessenger.cc
-rw-r--r-- | src/msg/SimpleMessenger.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 148300f159c..dd6b1bd944b 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -562,6 +562,8 @@ void SimpleMessenger::mark_down_all() p->unregister_pipe(); p->pipe_lock.Lock(); p->stop(); + if (p->connection_state) + p->connection_state->clear_pipe(p); p->pipe_lock.Unlock(); } lock.Unlock(); |