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: v15.2.11~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c6f589656bc62274da0095193f9fcf546b9d0ef;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 octopus ]
	src/mon/MonClient.h [ ditto ]
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 49c35a5abe3d..207ff8ff8fc8 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -695,9 +695,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
@@ -719,7 +719,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);
@@ -735,7 +735,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()
 {
   // collect the next batch of candidates who are listed right next to the ones
   // already tried
@@ -788,7 +788,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]);
     tried.insert(ranks[i]);
   }
 }
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index b04db11f1350..cd5394f5e285 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -314,9 +314,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(MessageRef m);
 
   std::map<entity_addrvec_t, MonConnection>::iterator _find_pending_con(