RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31399 from zy751713126/osd_stat

Browse Source 
mon/OSDMonitor: fix format error ceph osd stat --format json

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-11-17 01:07:37 +08:00 committed by GitHub
commit 0752f98d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mon/OSDMonitor.cc
View File

@ -5249,11 +5249,15 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op)
boost::scoped_ptr<Formatter> 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" ||