From 7103fb1b80787c4b1483271478b1c332956fda0b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 25 Nov 2008 17:28:00 -0800 Subject: [PATCH] mon: show both user data and actual disk space used --- src/mon/PGMap.h | 1 + src/mon/PGMonitor.cc | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h index 68fb28d033e10..c830481f71910 100644 --- a/src/mon/PGMap.h +++ b/src/mon/PGMap.h @@ -156,6 +156,7 @@ public: total_osd_num_objects -= s.num_objects; } + uint64_t total_pg_kb() { return total_pg_num_kb; } uint64_t total_kb() { return total_osd_kb; } uint64_t total_avail_kb() { return total_osd_kb_avail; } uint64_t total_used_kb() { return total_osd_kb_used; } diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 74aa20419991f..d8bbd9e7bf1c2 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -76,8 +76,9 @@ ostream& operator<<(ostream& out, PGMonitor& pm) string states = ss.str(); return out << "v" << pm.pg_map.version << ": " << pm.pg_map.pg_stat.size() << " pgs: " - << states - << "; " << kb_t(pm.pg_map.total_used_kb()) << " used, " + << states << "; " + << kb_t(pm.pg_map.total_pg_kb()) << " data, " + << kb_t(pm.pg_map.total_used_kb()) << " used, " << kb_t(pm.pg_map.total_avail_kb()) << " / " << kb_t(pm.pg_map.total_kb()) << " free"; } -- 2.39.5