Skip to content

Commit

Permalink
mon/PGMap: align table head and column in the same way
Browse files Browse the repository at this point in the history 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
  • Loading branch information
@xiexingguo
xiexingguo committed May 31, 2016
1 parent defb907 commit 27595ae
Showing 1 changed file with 94 additions and 94 deletions.
188 changes: 94 additions & 94 deletions src/mon/PGMap.cc
View file
Expand Up @@ -781,35 +781,35 @@ void PGMap::dump_pg_stats_plain(ostream& ss,
TextTable tab;

if (brief){
tab.define_column("PG_STAT", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("STATE", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UP", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UP_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("ACTING", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("ACTING_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("PG_STAT", TextTable::LEFT, TextTable::LEFT);
tab.define_column("STATE", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UP", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UP_PRIMARY", TextTable::LEFT, TextTable::LEFT);
tab.define_column("ACTING", TextTable::LEFT, TextTable::LEFT);
tab.define_column("ACTING_PRIMARY", TextTable::LEFT, TextTable::LEFT);
}
else {
tab.define_column("PG_STAT", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("OBJECTS", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("MISSING_ON_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DEGRADED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("MISPLACED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UNFOUND", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("BYTES", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("LOG", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DISK_LOG", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("STATE", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("STATE_STAMP", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("VERSION", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("REPORTED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UP", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UP_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("ACTING", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("ACTING_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("LAST_SCRUB", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("SCRUB_STAMP", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("LAST_DEEP_SCRUB", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DEEP_SCRUB_STAMP", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("PG_STAT", TextTable::LEFT, TextTable::LEFT);
tab.define_column("OBJECTS", TextTable::LEFT, TextTable::LEFT);
tab.define_column("MISSING_ON_PRIMARY", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DEGRADED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("MISPLACED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UNFOUND", TextTable::LEFT, TextTable::LEFT);
tab.define_column("BYTES", TextTable::LEFT, TextTable::LEFT);
tab.define_column("LOG", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DISK_LOG", TextTable::LEFT, TextTable::LEFT);
tab.define_column("STATE", TextTable::LEFT, TextTable::LEFT);
tab.define_column("STATE_STAMP", TextTable::LEFT, TextTable::LEFT);
tab.define_column("VERSION", TextTable::LEFT, TextTable::LEFT);
tab.define_column("REPORTED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UP", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UP_PRIMARY", TextTable::LEFT, TextTable::LEFT);
tab.define_column("ACTING", TextTable::LEFT, TextTable::LEFT);
tab.define_column("ACTING_PRIMARY", TextTable::LEFT, TextTable::LEFT);
tab.define_column("LAST_SCRUB", TextTable::LEFT, TextTable::LEFT);
tab.define_column("SCRUB_STAMP", TextTable::LEFT, TextTable::LEFT);
tab.define_column("LAST_DEEP_SCRUB", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DEEP_SCRUB_STAMP", TextTable::LEFT, TextTable::LEFT);
}

for (ceph::unordered_map<pg_t, pg_stat_t>::const_iterator i = pg_stats.begin();
Expand Down Expand Up @@ -884,25 +884,25 @@ void PGMap::dump_pool_stats(ostream& ss, bool header) const
TextTable tab;

if (header) {
tab.define_column("POOLID", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("OBJECTS", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("MISSING_ON_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DEGRADED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("MISPLACED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UNFOUND", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("BYTES", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("LOG", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DISK_LOG", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("POOLID", TextTable::LEFT, TextTable::LEFT);
tab.define_column("OBJECTS", TextTable::LEFT, TextTable::LEFT);
tab.define_column("MISSING_ON_PRIMARY", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DEGRADED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("MISPLACED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UNFOUND", TextTable::LEFT, TextTable::LEFT);
tab.define_column("BYTES", TextTable::LEFT, TextTable::LEFT);
tab.define_column("LOG", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DISK_LOG", TextTable::LEFT, TextTable::LEFT);
} else {
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
}

for (ceph::unordered_map<int,pool_stat_t>::const_iterator p = pg_pool_sum.begin();
Expand All @@ -928,25 +928,25 @@ void PGMap::dump_pg_sum_stats(ostream& ss, bool header) const
TextTable tab;

if (header) {
tab.define_column("PG_STAT", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("OBJECTS", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("MISSING_ON_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DEGRADED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("MISPLACED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UNFOUND", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("BYTES", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("LOG", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DISK_LOG", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("PG_STAT", TextTable::LEFT, TextTable::LEFT);
tab.define_column("OBJECTS", TextTable::LEFT, TextTable::LEFT);
tab.define_column("MISSING_ON_PRIMARY", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DEGRADED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("MISPLACED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UNFOUND", TextTable::LEFT, TextTable::LEFT);
tab.define_column("BYTES", TextTable::LEFT, TextTable::LEFT);
tab.define_column("LOG", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DISK_LOG", TextTable::LEFT, TextTable::LEFT);
} else {
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
tab.define_column("", TextTable::LEFT, TextTable::LEFT);
};

tab << "sum"
Expand All @@ -967,12 +967,12 @@ void PGMap::dump_osd_stats(ostream& ss) const
{
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.define_column("HB_IN", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("PG_SUM", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("OSD_STAT", TextTable::LEFT, TextTable::LEFT);
tab.define_column("USED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("AVAIL", TextTable::LEFT, TextTable::LEFT);
tab.define_column("TOTAL", TextTable::LEFT, TextTable::LEFT);
tab.define_column("HB_IN", TextTable::LEFT, TextTable::LEFT);
tab.define_column("PG_SUM", TextTable::LEFT, TextTable::LEFT);

for (ceph::unordered_map<int32_t,osd_stat_t>::const_iterator p = osd_stat.begin();
p != osd_stat.end();
Expand All @@ -999,10 +999,10 @@ void PGMap::dump_osd_sum_stats(ostream& ss) const
{
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.define_column("OSD_STAT", TextTable::LEFT, TextTable::LEFT);
tab.define_column("USED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("AVAIL", TextTable::LEFT, TextTable::LEFT);
tab.define_column("TOTAL", TextTable::LEFT, TextTable::LEFT);

tab << "sum"
<< prettybyte_t(osd_sum.kb_used << 10)
Expand Down Expand Up @@ -1794,27 +1794,27 @@ void PGMap::dump_filtered_pg_stats(ostream& ss, set<pg_t>& pgs)
{
TextTable tab;

tab.define_column("PG_STAT", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("OBJECTS", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("MISSING_ON_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DEGRADED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("MISPLACED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UNFOUND", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("BYTES", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("LOG", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DISK_LOG", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("STATE", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("STATE_STAMP", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("VERSION", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("REPORTED", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UP", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("UP_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("ACTING", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("ACTING_PRIMARY", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("LAST_SCRUB", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("SCRUB_STAMP", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("LAST_DEEP_SCRUB", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("DEEP_SCRUB_STAMP", TextTable::LEFT, TextTable::RIGHT);
tab.define_column("PG_STAT", TextTable::LEFT, TextTable::LEFT);
tab.define_column("OBJECTS", TextTable::LEFT, TextTable::LEFT);
tab.define_column("MISSING_ON_PRIMARY", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DEGRADED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("MISPLACED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UNFOUND", TextTable::LEFT, TextTable::LEFT);
tab.define_column("BYTES", TextTable::LEFT, TextTable::LEFT);
tab.define_column("LOG", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DISK_LOG", TextTable::LEFT, TextTable::LEFT);
tab.define_column("STATE", TextTable::LEFT, TextTable::LEFT);
tab.define_column("STATE_STAMP", TextTable::LEFT, TextTable::LEFT);
tab.define_column("VERSION", TextTable::LEFT, TextTable::LEFT);
tab.define_column("REPORTED", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UP", TextTable::LEFT, TextTable::LEFT);
tab.define_column("UP_PRIMARY", TextTable::LEFT, TextTable::LEFT);
tab.define_column("ACTING", TextTable::LEFT, TextTable::LEFT);
tab.define_column("ACTING_PRIMARY", TextTable::LEFT, TextTable::LEFT);
tab.define_column("LAST_SCRUB", TextTable::LEFT, TextTable::LEFT);
tab.define_column("SCRUB_STAMP", TextTable::LEFT, TextTable::LEFT);
tab.define_column("LAST_DEEP_SCRUB", TextTable::LEFT, TextTable::LEFT);
tab.define_column("DEEP_SCRUB_STAMP", TextTable::LEFT, TextTable::LEFT);

for (set<pg_t>::iterator i = pgs.begin(); i != pgs.end(); ++i) {
pg_stat_t& st = pg_stat[*i];
Expand Down

0 comments on commit 27595ae

Please sign in to comment.