From: Adam Kupczyk <akupczyk@mirantis.com>
Date: Wed, 2 Mar 2016 11:31:01 +0000 (+0100)
Subject: [MON] Fixed calculation of %USED. Now it is shows (space used by all replicas)/(raw... 
X-Git-Tag: v10.1.0~237^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7881%2Fhead;p=ceph.git

[MON] Fixed calculation of %USED. Now it is shows (space used by all replicas)/(raw space available on OSDs). Before it was (size of pool)/(raw space available on OSDs).

Signed-off-by: Adam Kupczyk akupczyk@mirantis.com
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 99e2287cf36f..4f0ad0c19692 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1359,7 +1359,7 @@ void PGMonitor::dump_object_stat_sum(TextTable &tbl, Formatter *f,
     int64_t kb_used = SHIFT_ROUND_UP(sum.num_bytes, 10);
     float used = 0.0;
     if (pg_map.osd_sum.kb > 0)
-      used = (float)kb_used / pg_map.osd_sum.kb;
+      used = (float)kb_used * raw_used_rate * curr_object_copies_rate / pg_map.osd_sum.kb;
     tbl << percentify(used*100);
     tbl << si_t(avail);
     tbl << sum.num_objects;