rbd: info command should indicate if parent is in trash

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/tools/rbd/action/Info.cc b/src/tools/rbd/action/Info.cc
index 3bfdeeb7d67a5f7621b845b64c70f76b2d34a782..9f754cc8c270b8a213efc5a8b4e63db0583737aa 100644 (file)
--- a/src/tools/rbd/action/Info.cc
+++ b/src/tools/rbd/action/Info.cc
@@ -69,7 +69,6 @@ static int do_show_info(librados::IoCtx &io_ctx, librbd::Image& image,
                         const std::string &snapname, Formatter *f)
 {
   librbd::image_info_t info;
-  std::string parent_pool, parent_name, parent_snapname;
   uint8_t old_format;
   uint64_t overlap, features, flags, snap_limit;
   bool snap_protected = false;
@@ -207,18 +206,33 @@ static int do_show_info(librados::IoCtx &io_ctx, librbd::Image& image,
   }
 
   // parent info, if present
-  if ((image.parent_info(&parent_pool, &parent_name, &parent_snapname) == 0) &&
+  std::string parent_pool, parent_name, parent_id, parent_snapname;
+  if ((image.parent_info2(&parent_pool, &parent_name, &parent_id,
+                          &parent_snapname) == 0) &&
       parent_name.length() > 0) {
+
+    librbd::trash_image_info_t trash_image_info;
+    librbd::RBD rbd;
+    r = rbd.trash_get(io_ctx, parent_id.c_str(), &trash_image_info);
+    bool trash_image_info_valid = (r == 0);
+
     if (f) {
       f->open_object_section("parent");
       f->dump_string("pool", parent_pool);
       f->dump_string("image", parent_name);
       f->dump_string("snapshot", parent_snapname);
+      if (trash_image_info_valid) {
+        f->dump_string("trash", parent_id);
+      }
       f->dump_unsigned("overlap", overlap);
       f->close_section();
     } else {
       std::cout << "\tparent: " << parent_pool << "/" << parent_name
-                << "@" << parent_snapname << std::endl;
+                << "@" << parent_snapname;
+      if (trash_image_info_valid) {
+        std::cout << " (trash " << parent_id << ")";
+      }
+      std::cout << std::endl;
       std::cout << "\toverlap: " << prettybyte_t(overlap) << std::endl;
     }
   }