From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 11 May 2016 06:35:20 +0000 (+0800)
Subject: mon/PGMAP: use TextTable for dump_osd_sum_stats()
X-Git-Tag: v11.0.0~407^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77db9d8122ab6b0a1f62b8451ba584f2f2c18223;p=ceph.git

mon/PGMAP: use TextTable for dump_osd_sum_stats()

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 395cd89a4c17..a6bfe0a63bad 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -999,11 +999,20 @@ void PGMap::dump_osd_stats(ostream& ss) const
 
 void PGMap::dump_osd_sum_stats(ostream& ss) const
 {
-  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;
+  TextTable tab;
+
+  tab.define_column("OSD_STAT", TextTable::LEFT, TextTable::RIGHT);
+  tab.define_column("USED", TextTable::LEFT, TextTable::RIGHT);
+  tab.define_column("AVAIL", TextTable::LEFT, TextTable::RIGHT);
+  tab.define_column("TOTAL", TextTable::LEFT, TextTable::RIGHT);
+
+  tab << "sum"
+      << prettybyte_t(osd_sum.kb_used)
+      << prettybyte_t(osd_sum.kb_avail)
+      << prettybyte_t(osd_sum.kb)
+      << TextTable::endrow;
+
+  ss << tab;
 }
 
 void PGMap::get_stuck_stats(int types, const utime_t cutoff,