From d3c6f1712f6c28f6212ce597c8e07760427be50b Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Sun, 2 Feb 2014 14:33:31 -0800 Subject: [PATCH] test/librados: use connect_cluster_pp() instead of duplicating it Signed-off-by: Josh Durgin --- src/test/librados/test.cc | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/src/test/librados/test.cc b/src/test/librados/test.cc index 30bb5b50c80cb..83f11b0b0b3a2 100644 --- a/src/test/librados/test.cc +++ b/src/test/librados/test.cc @@ -45,32 +45,10 @@ std::string create_one_pool(const std::string &pool_name, rados_t *cluster) std::string create_one_pool_pp(const std::string &pool_name, Rados &cluster) { - char *id = getenv("CEPH_CLIENT_ID"); - if (id) std::cerr << "Client id is: " << id << std::endl; - - int ret; - ret = cluster.init(id); - if (ret) { - std::ostringstream oss; - oss << "cluster.init failed with error " << ret; - return oss.str(); - } - ret = cluster.conf_read_file(NULL); - if (ret) { - cluster.shutdown(); - std::ostringstream oss; - oss << "cluster.conf_read_file failed with error " << ret; - return oss.str(); - } - cluster.conf_parse_env(NULL); - ret = cluster.connect(); - if (ret) { - cluster.shutdown(); - std::ostringstream oss; - oss << "cluster.connect failed with error " << ret; - return oss.str(); - } - ret = cluster.pool_create(pool_name.c_str()); + std::string err = connect_cluster_pp(cluster); + if (err.length()) + return err; + int ret = cluster.pool_create(pool_name.c_str()); if (ret) { cluster.shutdown(); std::ostringstream oss; -- 2.39.5