From: Sage Weil <sage@redhat.com>
Date: Wed, 16 Jan 2019 21:44:06 +0000 (-0600)
Subject: crimson/net: drop authenticator retry
X-Git-Tag: v14.1.0~358^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bb583f2bd2bb8fa556978b8c97906fdbce1fafc;p=ceph.git

crimson/net: drop authenticator retry

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/crimson/net/SocketConnection.cc b/src/crimson/net/SocketConnection.cc
index 745348f91f2f..587fc3978570 100644
--- a/src/crimson/net/SocketConnection.cc
+++ b/src/crimson/net/SocketConnection.cc
@@ -648,17 +648,8 @@ SocketConnection::handle_connect_reply(msgr_tag_t tag)
     logger().error("{} connect protocol version mispatch", __func__);
     throw std::system_error(make_error_code(error::negotiation_failure));
   case CEPH_MSGR_TAG_BADAUTHORIZER:
-    if (h.got_bad_auth) {
-      logger().error("{} got bad authorizer", __func__);
-      throw std::system_error(make_error_code(error::negotiation_failure));
-    }
-    h.got_bad_auth = true;
-    // try harder
-    return dispatcher.ms_get_authorizer(peer_type, true)
-      .then([this](auto&& auth) {
-        h.authorizer = std::move(auth);
-        return stop_t::no;
-      });
+    logger().error("{} got bad authorizer", __func__);
+    throw std::system_error(make_error_code(error::negotiation_failure));
   case CEPH_MSGR_TAG_RESETSESSION:
     reset_session();
     return seastar::make_ready_future<stop_t>(stop_t::no);
diff --git a/src/crimson/net/SocketConnection.h b/src/crimson/net/SocketConnection.h
index 8cbe575f69ab..6d6ea5176275 100644
--- a/src/crimson/net/SocketConnection.h
+++ b/src/crimson/net/SocketConnection.h
@@ -68,7 +68,6 @@ class SocketConnection : public Connection {
   struct Handshake {
     ceph_msg_connect connect;
     ceph_msg_connect_reply reply;
-    bool got_bad_auth = false;
     std::unique_ptr<AuthAuthorizer> authorizer;
     std::chrono::milliseconds backoff;
     uint32_t connect_seq = 0;