diff options
| author | Sage Weil <sage@inktank.com> | 2013-06-17 13:32:38 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-24 16:20:35 -0700 |
| commit | 1eab069017ce6b71e4bc2bb9679dbe31b50ae938 (patch) | |
| tree | c21fb84c84011cc89c353d0b4aa98444c4ba4398 | |
| parent | db06a5092bc45d0479fe492a5d592713a7c53494 (diff) | |
| download | ceph-1eab069017ce6b71e4bc2bb9679dbe31b50ae938.tar.gz | |
msgr: reaper: make sure pipe has been cleared (under pipe_lock)
All paths to pipe shutdown should have cleared the con->pipe reference
already. Assert as much.
Also, do it under pipe_lock!
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 9586305a2317c7d6bbf31c9cf5b67dc93ccab50d)
| -rw-r--r-- | src/msg/SimpleMessenger.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 04b364c3ded..c60be44e22d 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -223,6 +223,8 @@ void SimpleMessenger::reaper() ldout(cct,10) << "reaper reaping pipe " << p << " " << p->get_peer_addr() << dendl; p->pipe_lock.Lock(); p->discard_out_queue(); + if (p->connection_state) + p->connection_state->clear_pipe(p); p->pipe_lock.Unlock(); p->unregister_pipe(); assert(pipes.count(p)); @@ -231,8 +233,6 @@ void SimpleMessenger::reaper() if (p->sd >= 0) ::close(p->sd); ldout(cct,10) << "reaper reaped pipe " << p << " " << p->get_peer_addr() << dendl; - if (p->connection_state) - p->connection_state->clear_pipe(p); p->put(); ldout(cct,10) << "reaper deleted pipe " << p << dendl; } |