From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 22 Apr 2021 10:29:59 +0000 (+0200)
Subject: mon/MonClient: remove reopen_session() callback mechanism
X-Git-Tag: v16.2.5~43^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eda1db80b8a6647e9a705d288ec8dc32e0cc405a;p=ceph.git

mon/MonClient: remove reopen_session() callback mechanism

It's been unused for over 5 years, since commit 17d24292b812 ("osd:
remove old stats backoff mechanism").

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

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index f5cbc2a8052e..dbce3c312336 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -678,18 +678,6 @@ void MonClient::_finish_auth(int auth_err)
     _check_auth_tickets();
   }
   auth_cond.notify_all();
-
-  if (!auth_err) {
-    Context *cb = nullptr;
-    if (session_established_context) {
-      cb = session_established_context.release();
-    }
-    if (cb) {
-      monc_lock.unlock();
-      cb->complete(0);
-      monc_lock.lock();
-    }
-  }
 }
 
 // ---------
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index cb16965450bf..c6ee6b8eb92f 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -340,7 +340,6 @@ private:
 
   std::list<MessageRef> waiting_for_session;
   utime_t last_rotating_renew_sent;
-  std::unique_ptr<Context> session_established_context;
   bool had_a_connection;
   double reopen_interval_multiplier;
 
@@ -504,18 +503,9 @@ public:
     send_mon_message(MessageRef{m, false});
   }
   void send_mon_message(MessageRef m);
-  /**
-   * If you specify a callback, you should not call
-   * reopen_session() again until it has been triggered. The MonClient
-   * will behave, but the first callback could be triggered after
-   * the session has been killed and the MonClient has started trying
-   * to reconnect to another monitor.
-   */
-  void reopen_session(Context *cb=NULL) {
+
+  void reopen_session() {
     std::lock_guard l(monc_lock);
-    if (cb) {
-      session_established_context.reset(cb);
-    }
     _reopen_session();
   }