From e49b1e5743e8088a90c62b4931bb07c631d4efc7 Mon Sep 17 00:00:00 2001 From: zhengyin Date: Tue, 5 Nov 2019 15:29:34 +0800 Subject: [PATCH] osd/OSDMap: fix format error ceph osd stat --format json Fixes: https://tracker.ceph.com/issues/42501 Signed-off-by: Zheng Yin (cherry picked from commit a85499ca57dd22e61bcad614897dc5fd57196353) --- src/mon/OSDMonitor.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 3f3bfe26b0a3b..b49647a0878c8 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -4994,11 +4994,15 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) boost::scoped_ptr f(Formatter::create(format)); if (prefix == "osd stat") { - osdmap.print_summary(f.get(), ds, "", true); - if (f) + if (f) { + f->open_object_section("osdmap"); + osdmap.print_summary(f.get(), ds, "", true); + f->close_section(); f->flush(rdata); - else + } else { + osdmap.print_summary(nullptr, ds, "", true); rdata.append(ds); + } } else if (prefix == "osd dump" || prefix == "osd tree" || -- 2.39.5