From: Victor Denisov <denisovenator@gmail.com>
Date: Sun, 7 Jan 2018 23:29:08 +0000 (-0800)
Subject: rbd: translate pool id into name
X-Git-Tag: v13.0.2~545^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18ea8898078a66155a817013a95c1495c206c8d1;p=ceph.git

rbd: translate pool id into name

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
---

diff --git a/src/tools/rbd/action/Group.cc b/src/tools/rbd/action/Group.cc
index 999f0046827e4..bca9ed35567aa 100644
--- a/src/tools/rbd/action/Group.cc
+++ b/src/tools/rbd/action/Group.cc
@@ -295,12 +295,24 @@ int execute_list_images(const po::variables_map &vm) {
     if (GROUP_IMAGE_STATE_INCOMPLETE == state) {
       state_string = "incomplete";
     }
+
+    std::string pool_name = "";
+
+    librados::Rados rados(io_ctx);
+    librados::IoCtx pool_io_ctx;
+    r = rados.ioctx_create2(image.pool, pool_io_ctx);
+    if (r < 0) {
+      pool_name = "<missing data pool " + stringify(image.pool) + ">";
+    } else {
+      pool_name = pool_io_ctx.get_pool_name();
+    }
+
     if (f) {
       f->dump_string("image name", image_name);
-      f->dump_int("pool", image.pool);
+      f->dump_string("pool", pool_name);
       f->dump_int("state", state);
     } else
-      std::cout << image.pool << "/" << image_name << " " << state_string << std::endl;
+      std::cout << pool_name << "/" << image_name << " " << state_string << std::endl;
   }
 
   if (f) {