]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/simple: remove forced authorizer refresh
authorSage Weil <sage@redhat.com>
Wed, 16 Jan 2019 21:39:53 +0000 (15:39 -0600)
committerSage Weil <sage@redhat.com>
Wed, 16 Jan 2019 21:39:53 +0000 (15:39 -0600)
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 <sage@redhat.com>
src/msg/simple/Pipe.cc

index f0a2a4b1ca65d0e741fd946fd8051e5b163332a8..9210224e50eab59923c8c08b75ebe04dd2f839de 100644 (file)
@@ -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;