From: Concubidated Date: Thu, 16 Jan 2014 20:12:13 +0000 (-0800) Subject: osd: OSDMap: fix output from ceph status --format=json for num_in_osds X-Git-Tag: v0.78~311^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=790dda9c0b75fa5a59ce6187b6131dad54d6d3fe;p=ceph.git osd: OSDMap: fix output from ceph status --format=json for num_in_osds num_up_osds returns as an int value, while num_in_osds returns as a string. Since only an int can be returned from get_num_in_osds(), num_in_osds should should also be an int to remain consistant with num_up_osds. Fixes: 7159 Signed-off-by: Tyler Brekke --- diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 488ae6b0f81ba..3f7e12945bd8d 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -2181,7 +2181,7 @@ void OSDMap::print_summary(Formatter *f, ostream& out) const f->dump_int("epoch", get_epoch()); f->dump_int("num_osds", get_num_osds()); f->dump_int("num_up_osds", get_num_up_osds()); - f->dump_stream("num_in_osds") << get_num_in_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");