]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
src/test: get_connection -> connect_to_*
authorSage Weil <sage@redhat.com>
Mon, 30 Jul 2018 20:56:35 +0000 (15:56 -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/test/messenger/simple_client.cc
src/test/msgr/perf_msgr_client.cc

index 276371a2ab59875956a78d0aa9188a4688786399..a99ba4c339c5299cc569a83c40c792a81813d122 100644 (file)
@@ -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;
index 1442b05784a522d6f67a9490c6195d16e9278cc1..680ba2387ae2d2ae8f87ddb0c9d4c453844a4342 100644 (file)
@@ -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);