From ad8f88d00d7b566e7719c62bac688ffdbfa19041 Mon Sep 17 00:00:00 2001 From: Changcheng Liu Date: Thu, 2 Jul 2020 17:04:18 +0800 Subject: [PATCH] test/multi_stress_watch: use internel API to connect cluster use connect_cluster_pp API to connect cluster Signed-off-by: Changcheng Liu --- src/test/multi_stress_watch.cc | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/src/test/multi_stress_watch.cc b/src/test/multi_stress_watch.cc index 0871f3380d2..c8ebb94f79d 100644 --- a/src/test/multi_stress_watch.cc +++ b/src/test/multi_stress_watch.cc @@ -141,30 +141,13 @@ int main(int args, char **argv) return 1; } - char *id = getenv("CEPH_CLIENT_ID"); - if (id) std::cerr << "Client id is: " << id << std::endl; Rados cluster; - int ret; - ret = cluster.init(id); - if (ret) { - std::cerr << "Error " << ret << " in cluster.init" << std::endl; - return ret; - } - ret = cluster.conf_read_file(NULL); - if (ret) { - std::cerr << "Error " << ret << " in cluster.conf_read_file" << std::endl; - return ret; - } - ret = cluster.conf_parse_env(NULL); - if (ret) { - std::cerr << "Error " << ret << " in cluster.conf_read_env" << std::endl; - return ret; - } - ret = cluster.connect(); - if (ret) { - std::cerr << "Error " << ret << " in cluster.connect" << std::endl; - return ret; + std::string err = connect_cluster_pp(cluster); + if (err.length()) { + std::cerr << "Error " << err << std::endl; + return 1; } + if (type == "rep") test_replicated(cluster, pool_name, obj_name); else if (type == "ec") -- 2.47.3