From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 1 Apr 2021 08:55:36 +0000 (+0200)
Subject: mon/MonClient: reset auth state in shutdown()
X-Git-Tag: v15.2.11~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fde810291de2d6fdff5920daa08f42eaddb40c78;p=ceph.git

mon/MonClient: reset auth state in shutdown()

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)
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 8c3ac7bd4b79..49c35a5abe3d 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -511,7 +511,11 @@ void MonClient::shutdown()
 
   active_con.reset();
   pending_cons.clear();
+
   auth.reset();
+  global_id = 0;
+  authenticate_err = 0;
+  authenticated = false;
 
   monc_lock.unlock();