From: xie xingguo Date: Fri, 6 May 2016 01:25:48 +0000 (+0800) Subject: mon/PGMap: pretty output for "pg dump osds" command X-Git-Tag: v11.0.0~623^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=046caf5f7ee3f31f62714fbe9120e8020cf903ed;p=ceph.git mon/PGMap: pretty output for "pg dump osds" command before: [root@c7 yum.repos.d]# ceph pg dump osds dumped osds in format plain osdstat kbused kbavail kb hb in hb out 1 12914796 88268416 101183212 [0] [] 0 12914796 88268416 101183212 [1] [] sum 25829592 176536832 202366424 after: [root@c7 yum.repos.d]# ceph pg dump osds dumped osds in format plain osdstat used avail total hb in hb out 1 71883 kB 125 MB 195 MB [0] [] 0 71883 kB 125 MB 195 MB [1] [] sum 140 MB 250 MB 390 MB Signed-off-by: xie xingguo --- diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 645514bda24..4407814c8cb 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -885,31 +885,31 @@ void PGMap::dump_pg_sum_stats(ostream& ss, bool header) const void PGMap::dump_osd_stats(ostream& ss) const { - ss << "osdstat\tkbused\tkbavail\tkb\thb in\thb out\tpg sum" << std::endl; + ss << "osdstat\tused\tavail\ttotal\thb in\thb out\tpg sum" << std::endl; for (ceph::unordered_map::const_iterator p = osd_stat.begin(); p != osd_stat.end(); ++p) { ss << p->first - << "\t" << p->second.kb_used - << "\t" << p->second.kb_avail - << "\t" << p->second.kb + << "\t" << prettybyte_t(p->second.kb_used) + << "\t" << prettybyte_t(p->second.kb_avail) + << "\t" << prettybyte_t(p->second.kb) << "\t" << p->second.hb_in << "\t" << p->second.hb_out << "\t" << get_num_pg_by_osd(p->first) << std::endl; } - ss << " sum\t" << osd_sum.kb_used - << "\t" << osd_sum.kb_avail - << "\t" << osd_sum.kb + ss << " sum\t" << prettybyte_t(osd_sum.kb_used) + << "\t" << prettybyte_t(osd_sum.kb_avail) + << "\t" << prettybyte_t(osd_sum.kb) << std::endl; } void PGMap::dump_osd_sum_stats(ostream& ss) const { - ss << "osdstat\tkbused\tkbavail\tkb" << std::endl; - ss << " sum\t" << osd_sum.kb_used - << "\t" << osd_sum.kb_avail - << "\t" << osd_sum.kb + ss << "osdstat\tused\tavail\ttotal" << std::endl; + ss << " sum\t" << prettybyte_t(osd_sum.kb_used) + << "\t" << prettybyte_t(osd_sum.kb_avail) + << "\t" << prettybyte_t(osd_sum.kb) << std::endl; }