From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 30 Mar 2021 13:19:41 +0000 (+0200)
Subject: mon/MonClient: drop global_id arg from _add_conn() and _add_conns()
X-Git-Tag: v14.2.20~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd8cdf64c6a840fa2588edadffb0c14ff264cb99;p=ceph.git

mon/MonClient: drop global_id arg from _add_conn() and _add_conns()

Passing anything but MonClient instance's global_id doesn't make
sense.

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

Conflicts:
	src/mon/MonClient.cc [ commit 1e9b18008c5e ("mon: set
	  MonClient::_add_conn return type to void") not in nautilus ]
	src/mon/MonClient.h [ ditto ]
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 8c8ddca4c065..a0a6acd1dc64 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -653,9 +653,9 @@ void MonClient::_reopen_session(int rank)
   _start_hunting();
 
   if (rank >= 0) {
-    _add_conn(rank, global_id);
+    _add_conn(rank);
   } else {
-    _add_conns(global_id);
+    _add_conns();
   }
 
   // throw out old queued messages
@@ -680,7 +680,7 @@ void MonClient::_reopen_session(int rank)
   }
 }
 
-MonConnection& MonClient::_add_conn(unsigned rank, uint64_t global_id)
+MonConnection& MonClient::_add_conn(unsigned rank)
 {
   auto peer = monmap.get_addrs(rank);
   auto conn = messenger->connect_to_mon(peer);
@@ -696,7 +696,7 @@ MonConnection& MonClient::_add_conn(unsigned rank, uint64_t global_id)
   return inserted.first->second;
 }
 
-void MonClient::_add_conns(uint64_t global_id)
+void MonClient::_add_conns()
 {
   uint16_t min_priority = std::numeric_limits<uint16_t>::max();
   for (const auto& m : monmap.mon_info) {
@@ -718,7 +718,7 @@ void MonClient::_add_conns(uint64_t global_id)
     n = ranks.size();
   }
   for (unsigned i = 0; i < n; i++) {
-    _add_conn(ranks[i], global_id);
+    _add_conn(ranks[i]);
   }
 }
 
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index a7874b72a586..abdcd315ad05 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -299,9 +299,9 @@ private:
   void _finish_hunting(int auth_err);
   void _finish_auth(int auth_err);
   void _reopen_session(int rank = -1);
-  MonConnection& _add_conn(unsigned rank, uint64_t global_id);
+  MonConnection& _add_conn(unsigned rank);
+  void _add_conns();
   void _un_backoff();
-  void _add_conns(uint64_t global_id);
   void _send_mon_message(Message *m);
 
   std::map<entity_addrvec_t, MonConnection>::iterator _find_pending_con(