From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Tue, 22 Sep 2020 07:15:07 +0000 (+0800)
Subject: mon: set MonClient::_add_conn return type to void
X-Git-Tag: v16.1.0~979^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37329%2Fhead;p=ceph.git

mon: set MonClient::_add_conn return type to void

The new created MonConnection are refered through
MonClient::pending_cons instead of through the return
value.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 6859bc220ef..edff5f50958 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -741,17 +741,16 @@ void MonClient::_reopen_session(int rank)
   }
 }
 
-MonConnection& MonClient::_add_conn(unsigned rank, uint64_t global_id)
+void MonClient::_add_conn(unsigned rank, uint64_t global_id)
 {
   auto peer = monmap.get_addrs(rank);
   auto conn = messenger->connect_to_mon(peer);
   MonConnection mc(cct, conn, global_id, &auth_registry);
-  auto inserted = pending_cons.insert(std::make_pair(peer, std::move(mc)));
+  pending_cons.insert(std::make_pair(peer, std::move(mc)));
   ldout(cct, 10) << "picked mon." << monmap.get_name(rank)
                  << " con " << conn
                  << " addr " << peer
                  << dendl;
-  return inserted.first->second;
 }
 
 void MonClient::_add_conns(uint64_t global_id)
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index e079213c23b..c7f245feec4 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -351,7 +351,7 @@ 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);
+  void _add_conn(unsigned rank, uint64_t global_id);
   void _un_backoff();
   void _add_conns(uint64_t global_id);
   void _send_mon_message(MessageRef m);