]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MonClient: get_connection -> connect_to_mon
authorSage Weil <sage@redhat.com>
Mon, 30 Jul 2018 20:57:10 +0000 (15:57 -0500)
committerSage Weil <sage@redhat.com>
Mon, 30 Jul 2018 20:59:50 +0000 (15:59 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/MonClient.cc

index b53ee2fe14b96551a77a9a041e8ea1bf65af3da5..fdc746bac33639f24a562e97c7dfc2bb92c6069c 100644 (file)
@@ -227,7 +227,7 @@ int MonClient::ping_monitor(const string &mon_id, string *result_reply)
   smsgr->add_dispatcher_head(pinger);
   smsgr->start();
 
-  ConnectionRef con = smsgr->get_connection(monmap.get_inst(new_mon_id));
+  ConnectionRef con = smsgr->connect_to_mon(monmap.get_addrs(new_mon_id));
   ldout(cct, 10) << __func__ << " ping mon." << new_mon_id
                  << " " << con->get_peer_addr() << dendl;
   con->send_message(new MPing);
@@ -665,7 +665,7 @@ void MonClient::_reopen_session(int rank)
 MonConnection& MonClient::_add_conn(unsigned rank, uint64_t global_id)
 {
   auto peer = monmap.get_addr(rank);
-  auto conn = messenger->get_connection(monmap.get_inst(rank));
+  auto conn = messenger->connect_to_mon(monmap.get_addrs(rank));
   MonConnection mc(cct, conn, global_id);
   auto inserted = pending_cons.insert(make_pair(peer, move(mc)));
   ldout(cct, 10) << "picked mon." << monmap.get_name(rank)