Merge pull request ceph#25859 from xiexingguo/wip-async-no-force-rene…

…w-auth msg/async: do not force updating rotating keys inline Reviewed-by: Sage Weil <[email protected]>
rouming · Jan 14, 2019 · 96a20b7 · 96a20b7
2 parents 1c845f3 + 794a8f9
commit 96a20b7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc
@@ -80,7 +80,6 @@ ProtocolV1::ProtocolV1(AsyncConnection *connection)
       once_ready(false),
       state(NONE),
       global_seq(0),
-      got_bad_auth(false),
       authorizer(nullptr),
       wait_for_seq(false) {
   temp_buffer = new char[4096];
@@ -101,7 +100,6 @@ void ProtocolV1::connect() {
   this->state = START_CONNECT;
 
   // reset connect state variables
-  got_bad_auth = false;
   if (authorizer) {
     delete authorizer;
     authorizer = nullptr;
@@ -1241,7 +1239,6 @@ void ProtocolV1::reset_recv_state() {
       delete authorizer;
     }
     authorizer = nullptr;
-    got_bad_auth = false;
   }
 
   // clean read and write callbacks
@@ -1568,14 +1565,7 @@ CtPtr ProtocolV1::handle_connect_reply_2() {
 
   if (connect_reply.tag == CEPH_MSGR_TAG_BADAUTHORIZER) {
     ldout(cct, 0) << __func__ << " connect got BADAUTHORIZER" << dendl;
-    if (got_bad_auth) {
-      return _fault();
-    }
-    got_bad_auth = true;
-    delete authorizer;
-    authorizer = messenger->ms_deliver_get_authorizer(connection->peer_type,
-						      true);  // try harder
-    return CONTINUE(send_connect_message);
+    return _fault();
   }
 
   if (connect_reply.tag == CEPH_MSGR_TAG_RESETSESSION) {

diff --git a/src/msg/async/ProtocolV1.h b/src/msg/async/ProtocolV1.h
@@ -226,7 +226,6 @@ handle_tag_ack           |              v                                 |
   // Client Protocol
 private:
   int global_seq;
-  bool got_bad_auth;
   AuthAuthorizer *authorizer;
 
   CONTINUATION_DECL(ProtocolV1, send_client_banner);
@@ -301,4 +300,4 @@ class LoopbackProtocolV1 : public ProtocolV1 {
   }
 };
 
-#endif /* _MSG_ASYNC_PROTOCOL_V1_ */
+#endif /* _MSG_ASYNC_PROTOCOL_V1_ */
diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
@@ -75,7 +75,6 @@ ProtocolV2::ProtocolV2(AsyncConnection *connection)
       once_ready(false),
       state(NONE),
       global_seq(0),
-      got_bad_auth(false),
       authorizer(nullptr),
       wait_for_seq(false) {
   temp_buffer = new char[4096];
@@ -96,7 +95,6 @@ void ProtocolV2::connect() {
   this->state = START_CONNECT;
 
   // reset connect state variables
-  got_bad_auth = false;
   if (authorizer) {
     delete authorizer;
     authorizer = nullptr;
@@ -1238,7 +1236,6 @@ void ProtocolV2::reset_recv_state() {
       delete authorizer;
     }
     authorizer = nullptr;
-    got_bad_auth = false;
   }
 
   // clean read and write callbacks
@@ -1598,14 +1595,7 @@ CtPtr ProtocolV2::handle_connect_reply_2() {
 
   if (connect_reply.tag == CEPH_MSGR_TAG_BADAUTHORIZER) {
     ldout(cct, 0) << __func__ << " connect got BADAUTHORIZER" << dendl;
-    if (got_bad_auth) {
-      return _fault();
-    }
-    got_bad_auth = true;
-    delete authorizer;
-    authorizer = messenger->ms_deliver_get_authorizer(connection->peer_type,
-                                                      true);  // try harder
-    return CONTINUE(send_connect_message);
+    return _fault();
   }
 
   if (connect_reply.tag == CEPH_MSGR_TAG_RESETSESSION) {

diff --git a/src/msg/async/ProtocolV2.h b/src/msg/async/ProtocolV2.h
@@ -181,7 +181,6 @@ class ProtocolV2 : public Protocol {
   // Client Protocol
 private:
   int global_seq;
-  bool got_bad_auth;
   AuthAuthorizer *authorizer;
 
   CONTINUATION_DECL(ProtocolV2, send_client_banner);