From c252345889097361e30d3fffee9cc3cfb7af3e68 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Tue, 15 Apr 2014 17:55:18 +0100 Subject: [PATCH] osd: OSDMap: have osdmap json dump print valid boolean instead of string Fixes: 8108 Signed-off-by: Joao Eduardo Luis --- PendingReleaseNotes | 4 ++++ src/osd/OSDMap.cc | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 9a4cc081bda7..7494e6e9e45c 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -1,3 +1,7 @@ v0.80 ----- + +* OSDMap's json-formatted dump changed for keys 'full' and 'nearfull'. + What was previously being outputted as 'true' or 'false' strings are + now being outputted 'true' and 'false' booleans according to json syntax. diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index a764f34cdbcc..fc61d4356d41 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -2426,9 +2426,8 @@ void OSDMap::print_summary(Formatter *f, ostream& out) const f->dump_int("num_osds", get_num_osds()); f->dump_int("num_up_osds", get_num_up_osds()); f->dump_int("num_in_osds", get_num_in_osds()); - f->dump_string("full", test_flag(CEPH_OSDMAP_FULL) ? "true" : "false"); - f->dump_string("nearfull", test_flag(CEPH_OSDMAP_NEARFULL) ? - "true" : "false"); + f->dump_bool("full", test_flag(CEPH_OSDMAP_FULL) ? true : false); + f->dump_bool("nearfull", test_flag(CEPH_OSDMAP_NEARFULL) ? true : false); f->close_section(); } else { out << " osdmap e" << get_epoch() << ": " -- 2.47.3