]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MonClient: reset auth state in shutdown()
authorIlya Dryomov <idryomov@gmail.com>
Thu, 1 Apr 2021 08:55:36 +0000 (10:55 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 12 Apr 2021 19:59:41 +0000 (21:59 +0200)
Destroying AuthClientHandler and not resetting global_id is another
way to get MonClient to send CEPHX_GET_AUTH_SESSION_KEY requests with
CephXAuthenticate::old_ticket not populated.  This is particularly
pertinent to get_monmap_and_config() which shuts down the bootstrap
MonClient between retry attempts.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit c9b022e07392979e7f9ea6c11484a7dd872cc235)

src/mon/MonClient.cc

index d57075f5797a4041916f345b73b506197f556051..8c8ddca4c065b2f41578521730c36d3807625584 100644 (file)
@@ -492,7 +492,11 @@ void MonClient::shutdown()
 
   active_con.reset();
   pending_cons.clear();
+
   auth.reset();
+  global_id = 0;
+  authenticate_err = 0;
+  authenticated = false;
 
   monc_lock.Unlock();