From c6cd5a9418046ab5ae2289c80a9ef6962bf85801 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 6 Jun 2017 09:39:18 -0400 Subject: [PATCH] rbd-replay: removed default rbd pool name Signed-off-by: Jason Dillaman --- src/rbd_replay/Replayer.cc | 14 ++++++++++++-- src/rbd_replay/rbd-replay.cc | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/rbd_replay/Replayer.cc b/src/rbd_replay/Replayer.cc index 3d57b0ad94590..ca1eaba84416f 100644 --- a/src/rbd_replay/Replayer.cc +++ b/src/rbd_replay/Replayer.cc @@ -162,8 +162,8 @@ rbd_loc Worker::map_image_name(string image_name, string snap_name) const { Replayer::Replayer(int num_action_trackers) - : m_rbd(NULL), m_ioctx(0), - m_pool_name("rbd"), m_latency_multiplier(1.0), + : m_rbd(NULL), m_ioctx(0), + m_latency_multiplier(1.0), m_readonly(false), m_dump_perf_counters(false), m_num_action_trackers(num_action_trackers), m_action_trackers(new action_tracker_d[m_num_action_trackers]) { @@ -192,6 +192,16 @@ void Replayer::run(const std::string& replay_file) { cerr << "Failed to connect to cluster: " << cpp_strerror(r) << std::endl; goto out; } + + if (m_pool_name.empty()) { + r = rados.conf_get("rbd_default_pool", m_pool_name); + if (r < 0) { + cerr << "Failed to retrieve default pool: " << cpp_strerror(r) + << std::endl; + goto out; + } + } + m_ioctx = new librados::IoCtx(); { r = rados.ioctx_create(m_pool_name.c_str(), *m_ioctx); diff --git a/src/rbd_replay/rbd-replay.cc b/src/rbd_replay/rbd-replay.cc index 3ec490ecb3b04..274431c19f941 100644 --- a/src/rbd_replay/rbd-replay.cc +++ b/src/rbd_replay/rbd-replay.cc @@ -64,7 +64,7 @@ int main(int argc, const char **argv) { CODE_ENVIRONMENT_UTILITY, 0); std::vector::iterator i; - string pool_name = "rbd"; + string pool_name; float latency_multiplier = 1; bool readonly = false; ImageNameMap image_name_map; -- 2.39.5