From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 27 May 2016 01:10:50 +0000 (+0800)
Subject: mon/PGMap: fix wrong size of dump_* commands
X-Git-Tag: ses5-milestone5~293^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f658c8d8e3a0714b608a76f61eedbb4a140ec1d7;p=ceph.git

mon/PGMap: fix wrong size of dump_* commands

The prettybyte_t considers the input as bytes, so the
pre-cast is needed here.

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

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 3064edf0914..78921dbca6e 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -978,18 +978,18 @@ void PGMap::dump_osd_stats(ostream& ss) const
        p != osd_stat.end();
        ++p) {
     tab << p->first
-        << prettybyte_t(p->second.kb_used)
-        << prettybyte_t(p->second.kb_avail)
-        << prettybyte_t(p->second.kb)
+        << prettybyte_t(p->second.kb_used << 10)
+        << prettybyte_t(p->second.kb_avail << 10)
+        << prettybyte_t(p->second.kb << 10)
         << p->second.hb_in
         << get_num_pg_by_osd(p->first)
         << TextTable::endrow;
   }
 
   tab << "sum"
-      << prettybyte_t(osd_sum.kb_used)
-      << prettybyte_t(osd_sum.kb_avail)
-      << prettybyte_t(osd_sum.kb)
+      << prettybyte_t(osd_sum.kb_used << 10)
+      << prettybyte_t(osd_sum.kb_avail << 10)
+      << prettybyte_t(osd_sum.kb << 10)
       << TextTable::endrow;
 
   ss << tab;
@@ -1005,9 +1005,9 @@ void PGMap::dump_osd_sum_stats(ostream& ss) const
   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)
+      << prettybyte_t(osd_sum.kb_used << 10)
+      << prettybyte_t(osd_sum.kb_avail << 10)
+      << prettybyte_t(osd_sum.kb << 10)
       << TextTable::endrow;
 
   ss << tab;