From 708f02011573c1640cb3bdf8cb565637e153a7e4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 16 Jan 2019 15:39:53 -0600 Subject: [PATCH] msg/simple: remove forced authorizer refresh This synchronous check has always been kludgey; remove it and just fault instead, just like we did with 794a8f9cf51cf176636d114ccfbbf68fbc304083 in AsyncMessenger. Signed-off-by: Sage Weil --- src/msg/simple/Pipe.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc index f0a2a4b1ca6..9210224e50e 100644 --- a/src/msg/simple/Pipe.cc +++ b/src/msg/simple/Pipe.cc @@ -993,8 +993,6 @@ void Pipe::set_socket_options() int Pipe::connect() { - bool got_bad_auth = false; - ldout(msgr->cct,10) << "connect " << connect_seq << dendl; ceph_assert(pipe_lock.is_locked()); @@ -1260,13 +1258,7 @@ int Pipe::connect() if (reply.tag == CEPH_MSGR_TAG_BADAUTHORIZER) { ldout(msgr->cct,0) << "connect got BADAUTHORIZER" << dendl; - if (got_bad_auth) - goto stop_locked; - got_bad_auth = true; - pipe_lock.Unlock(); - delete authorizer; - authorizer = msgr->ms_deliver_get_authorizer(peer_type, true); - continue; + goto fail_locked; } if (reply.tag == CEPH_MSGR_TAG_RESETSESSION) { ldout(msgr->cct,0) << "connect got RESETSESSION" << dendl; -- 2.39.5