From 708d7bb0c5870a77c7eee86e2a720b3d669db9bc Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 6 Jun 2017 09:40:13 -0400 Subject: [PATCH] rbd-nbd: removed default rbd pool name Signed-off-by: Jason Dillaman --- src/tools/rbd_nbd/rbd-nbd.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc index a8e4bf60395..b247c02546f 100644 --- a/src/tools/rbd_nbd/rbd-nbd.cc +++ b/src/tools/rbd_nbd/rbd-nbd.cc @@ -73,7 +73,7 @@ static void usage() generic_server_usage(); } -static std::string devpath, poolname("rbd"), imgname, snapname; +static std::string devpath, poolname, imgname, snapname; static bool readonly = false; static int nbds_max = 0; static int max_part = 255; @@ -646,6 +646,14 @@ static int do_map(int argc, const char *argv[]) if (r < 0) goto close_nbd; + if (poolname.empty()) { + r = rados.conf_get("rbd_default_pool", poolname); + if (r < 0) { + cerr << "rbd-nbd: failed to retrieve default pool" << std::endl; + goto close_nbd; + } + } + r = rados.ioctx_create(poolname.c_str(), io_ctx); if (r < 0) goto close_nbd; @@ -792,8 +800,11 @@ static int parse_imgpath(const std::string &imgpath) return -EINVAL; } - if (match[1].matched) + if (match[1].matched) { poolname = match[1]; + } else { + poolname = ""; + } imgname = match[2]; -- 2.39.5