From 9586305a2317c7d6bbf31c9cf5b67dc93ccab50d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 17 Jun 2013 13:32:38 -0700 Subject: [PATCH] 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 --- src/msg/SimpleMessenger.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 2bee4d6370d8c..0b0fa662ebaeb 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -222,6 +222,11 @@ 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) { + // mark_down, mark_down_all, or fault() should have done this, but make sure! + bool cleared = p->connection_state->clear_pipe(p); + assert(!cleared); + } p->pipe_lock.Unlock(); p->unregister_pipe(); assert(pipes.count(p)); @@ -230,8 +235,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; } -- 2.39.5