]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/crimson: always use "async" for alien msgr
authorKefu Chai <kchai@redhat.com>
Mon, 11 Feb 2019 14:02:02 +0000 (22:02 +0800)
committerYingxin Cheng <yingxincheng@gmail.com>
Tue, 12 Feb 2019 16:03:20 +0000 (00:03 +0800)
avoid reading from conf as it is not populated yet without calling
`ceph::common::sharded_conf().start()` first.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/test/crimson/test_alien_echo.cc

index 74b6a9af706112a6a7bac43b075737cba3a9834b..ad91f74078a3380213244292306ba12320e6bd08 100644 (file)
@@ -106,7 +106,7 @@ struct Server {
   Server(CephContext* cct, const entity_inst_t& entity)
     : dispatcher(cct)
   {
-    msgr.reset(Messenger::create(cct, cct->_conf.get_val<string>("ms_type"),
+    msgr.reset(Messenger::create(cct, "async",
                                  entity.name, "pong", entity.addr.get_nonce(), 0));
     msgr->set_cluster_protocol(CEPH_OSD_PROTOCOL);
     msgr->set_default_policy(Messenger::Policy::stateless_server(0));
@@ -161,7 +161,7 @@ struct Client {
   Client(CephContext *cct)
     : dispatcher(cct)
   {
-    msgr.reset(Messenger::create(cct, cct->_conf.get_val<string>("ms_type"),
+    msgr.reset(Messenger::create(cct, "async",
                                  entity_name_t::CLIENT(-1), "ping",
                                  getpid(), 0));
     msgr->set_cluster_protocol(CEPH_OSD_PROTOCOL);