From: songweibin <song.weibin@zte.com.cn>
Date: Fri, 13 Apr 2018 00:39:31 +0000 (+0800)
Subject: rbd: add object section for every trash image
X-Git-Tag: v13.1.0~232^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b7cbb18594bef8be717e777ef2babb0c3083568;p=ceph.git

rbd: add object section for every trash image

Signed-off-by: songweibin <song.weibin@zte.com.cn>
---

diff --git a/src/tools/rbd/action/Trash.cc b/src/tools/rbd/action/Trash.cc
index a6fccbd99db..bb97cab5e8a 100644
--- a/src/tools/rbd/action/Trash.cc
+++ b/src/tools/rbd/action/Trash.cc
@@ -209,8 +209,10 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool long_flag,
     }
     for (const auto& entry : trash_entries) {
        if (f) {
+         f->open_object_section("image");
          f->dump_string("id", entry.id);
          f->dump_string("name", entry.name);
+         f->close_section();
        } else {
          std::cout << entry.id << " " << entry.name << std::endl;
        }