summaryrefslogtreecommitdiffstats
path: root/src/test/messenger
diff options
context:
space:
mode:
authorliuchang0812 <liuchang0812@gmail.com>2017-03-21 14:53:41 +0100
committerliuchang0812 <liuchang0812@gmail.com>2017-03-22 13:39:51 +0100
commite6755fa59678553b6b62cc4c05fd53177b179c76 (patch)
tree163cb24512557affc1ec54b1c4b2addf38cdf8f4 /src/test/messenger
parentos/bluestore: convert rocksdb_db_paths to SAFE_OPTION (diff)
downloadceph-e6755fa59678553b6b62cc4c05fd53177b179c76.tar.xz
ceph-e6755fa59678553b6b62cc4c05fd53177b179c76.zip
common: convert ms_type option to SAFE_OPTION
We need to modify ms_type in unittest. That use SAFE_OPTION to declare ms_type is safer than pass `safe=false` to set_val. Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
Diffstat (limited to 'src/test/messenger')
-rw-r--r--src/test/messenger/simple_client.cc2
-rw-r--r--src/test/messenger/simple_server.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/messenger/simple_client.cc b/src/test/messenger/simple_client.cc
index 7b37921b04f..e85c73e4230 100644
--- a/src/test/messenger/simple_client.cc
+++ b/src/test/messenger/simple_client.cc
@@ -103,7 +103,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->ms_type,
+ messenger = Messenger::create(g_ceph_context, g_conf->get_val<std::string>("ms_type"),
entity_name_t::MON(-1),
"client",
getpid(), 0);
diff --git a/src/test/messenger/simple_server.cc b/src/test/messenger/simple_server.cc
index a10cdc5472c..34277d513ff 100644
--- a/src/test/messenger/simple_server.cc
+++ b/src/test/messenger/simple_server.cc
@@ -74,7 +74,7 @@ int main(int argc, const char **argv)
dest_str += port;
entity_addr_from_url(&bind_addr, dest_str.c_str());
- messenger = Messenger::create(g_ceph_context, g_conf->ms_type,
+ messenger = Messenger::create(g_ceph_context, g_conf->get_val<std::string>("ms_type"),
entity_name_t::MON(-1),
"simple_server",
0 /* nonce */,