From 4c2659a0f49ff5f709a8275d6adaa817daf8f76a Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Fri, 16 Dec 2016 12:50:50 +0200 Subject: [PATCH] rbd: fix json formatting for image and journal status output Fixes: http://tracker.ceph.com/issues/18261 Signed-off-by: Mykola Golub --- src/tools/rbd/action/Journal.cc | 4 +++- src/tools/rbd/action/Status.cc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tools/rbd/action/Journal.cc b/src/tools/rbd/action/Journal.cc index b90a88ec1c81..0e3e6b3d62cc 100644 --- a/src/tools/rbd/action/Journal.cc +++ b/src/tools/rbd/action/Journal.cc @@ -111,10 +111,12 @@ static int do_show_journal_status(librados::IoCtx& io_ctx, f->open_object_section("status"); f->dump_unsigned("minimum_set", minimum_set); f->dump_unsigned("active_set", active_set); - f->open_object_section("registered_clients"); + f->open_array_section("registered_clients"); for (std::set::iterator c = registered_clients.begin(); c != registered_clients.end(); ++c) { + f->open_object_section("client"); c->dump(f); + f->close_section(); } f->close_section(); f->close_section(); diff --git a/src/tools/rbd/action/Status.cc b/src/tools/rbd/action/Status.cc index a6944f0d1a57..9d2951e4a29e 100644 --- a/src/tools/rbd/action/Status.cc +++ b/src/tools/rbd/action/Status.cc @@ -50,7 +50,7 @@ static int do_show_status(librados::IoCtx &io_ctx, librbd::Image &image, f->open_object_section("status"); if (f) { - f->open_object_section("watchers"); + f->open_array_section("watchers"); for (std::list::iterator i = watchers.begin(); i != watchers.end(); ++i) { f->open_object_section("watcher"); f->dump_string("address", i->addr); -- 2.47.3