update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / test / messenger / simple_client.cc

diff --git a/ceph/src/test/messenger/simple_client.cc b/ceph/src/test/messenger/simple_client.cc
index e85c73e4230e135afc58060875af6460a1160e98..ba7ed2b0966e24e652a50d023b03b5456ff4f5e9 100644 (file)
--- a/ceph/src/test/messenger/simple_client.cc
+++ b/ceph/src/test/messenger/simple_client.cc
@@ -67,11 +67,10 @@ int main(int argc, const char **argv)
        ts.tv_nsec = 0;
 
        argv_to_vec(argc, argv, args);
-       env_to_vec(args);
 
        auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_ANY,
                               CODE_ENVIRONMENT_UTILITY,
-                              0);
+                              CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
 
        for (arg_iter = args.begin(); arg_iter != args.end();) {
          if (ceph_argparse_witharg(args, arg_iter, &val, "--addr",
@@ -103,7 +102,7 @@ int main(int argc, const char **argv)
          "initial msgs (pipe depth) " << n_msgs << " " <<
          "data buffer size " << n_dsize << std::endl;
 
-       messenger = Messenger::create(g_ceph_context, g_conf->get_val<std::string>("ms_type"),
+       messenger = Messenger::create(g_ceph_context, g_conf().get_val<std::string>("ms_type"),
                                      entity_name_t::MON(-1),
                                      "client",
                                      getpid(), 0);
@@ -117,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);
@@ -128,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;