From 3e21745280ee6c2bd36bead6fff9ccedbafc66ae Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 30 Jul 2018 15:56:35 -0500 Subject: [PATCH] src/test: get_connection -> connect_to_* Signed-off-by: Sage Weil --- src/test/messenger/simple_client.cc | 4 ++-- src/test/msgr/perf_msgr_client.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/messenger/simple_client.cc b/src/test/messenger/simple_client.cc index 276371a2ab59..a99ba4c339c5 100644 --- a/src/test/messenger/simple_client.cc +++ b/src/test/messenger/simple_client.cc @@ -116,7 +116,7 @@ int main(int argc, const char **argv) dest_str += ":"; dest_str += port; entity_addr_from_url(&dest_addr, dest_str.c_str()); - entity_inst_t dest_server(entity_name_t::MON(-1), dest_addr); + entity_addrvec_t dest_addrs(dest_addr); dispatcher = new SimpleDispatcher(messenger); messenger->add_dispatcher_head(dispatcher); @@ -127,7 +127,7 @@ int main(int argc, const char **argv) if (r < 0) goto out; - conn = messenger->get_connection(dest_server); + conn = messenger->connect_to_mon(dest_addrs); // do stuff time_t t1, t2; diff --git a/src/test/msgr/perf_msgr_client.cc b/src/test/msgr/perf_msgr_client.cc index 1442b05784a5..680ba2387ae2 100644 --- a/src/test/msgr/perf_msgr_client.cc +++ b/src/test/msgr/perf_msgr_client.cc @@ -139,8 +139,8 @@ class MessengerClient { Messenger *msgr = Messenger::create(g_ceph_context, type, entity_name_t::CLIENT(0), "client", getpid()+i, 0); msgr->set_default_policy(Messenger::Policy::lossless_client(0)); msgr->start(); - entity_inst_t inst(entity_name_t::OSD(0), addr); - ConnectionRef conn = msgr->get_connection(inst); + entity_addrvec_t addrs(addr); + ConnectionRef conn = msgr->connect_to_osd(addrs); ClientThread *t = new ClientThread(msgr, c, conn, msg_len, ops, think_time_us); msgrs.push_back(msgr); clients.push_back(t); -- 2.47.3