From dd4addef2d5b457cc9a58782fe42af6b13c68b81 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 15 Jul 2013 17:14:25 -0700 Subject: [PATCH] msgr: maintain list of accepting pipes New pipes exist in a sort of limbo before we know who the peer is and add them to rank_pipe. Keep a list of them in accepting_pipes for that period. Signed-off-by: Sage Weil --- src/msg/Pipe.cc | 4 ++++ src/msg/SimpleMessenger.cc | 1 + src/msg/SimpleMessenger.h | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc index 5c10e1b8cd534..22114f48e62fc 100644 --- a/src/msg/Pipe.cc +++ b/src/msg/Pipe.cc @@ -595,6 +595,7 @@ int Pipe::accept() // open connect_seq = connect.connect_seq + 1; peer_global_seq = connect.global_seq; + assert(state == STATE_ACCEPTING); state = STATE_OPEN; ldout(msgr->cct,10) << "accept success, connect_seq = " << connect_seq << ", sending READY" << dendl; @@ -621,6 +622,8 @@ int Pipe::accept() // ok! if (msgr->dispatch_queue.stop) goto shutting_down; + inr removed = msgr->accepting_pipes.erase(this); + assert(removed == 1); register_pipe(); msgr->lock.Unlock(); @@ -1098,6 +1101,7 @@ void Pipe::unregister_pipe() msgr->rank_pipe.erase(p); } else { ldout(msgr->cct,10) << "unregister_pipe - not registered" << dendl; + msgr->accepting_pipes.erase(this); // somewhat overkill, but safe. } } diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 2afa449dfbce9..0a3b33860af2d 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -312,6 +312,7 @@ Pipe *SimpleMessenger::add_accept_pipe(int sd) p->start_reader(); p->pipe_lock.Unlock(); pipes.insert(p); + accepting_pipes.insert(p); lock.Unlock(); return p; } diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h index 47ee145aa5e12..4538b0f18bcf2 100644 --- a/src/msg/SimpleMessenger.h +++ b/src/msg/SimpleMessenger.h @@ -514,6 +514,12 @@ private: * invalid and can be replaced by anyone holding the msgr lock */ hash_map rank_pipe; + /** + * list of pipes are in teh process of accepting + * + * These are not yet in the rank_pipe map. + */ + set accepting_pipes; /// a set of all the Pipes we have which are somehow active set pipes; /// a list of Pipes we want to tear down -- 2.39.5