import ceph nautilus 14.2.2

[ceph.git] / ceph / src / librados / librados_cxx.cc

diff --git a/ceph/src/librados/librados_cxx.cc b/ceph/src/librados/librados_cxx.cc
index c174c7d58a79669e76b1962f3bb92b7af3a0178d..77190788a678563aa82ecc493bf37d2352a1bc81 100644 (file)
--- a/ceph/src/librados/librados_cxx.cc
+++ b/ceph/src/librados/librados_cxx.cc
@@ -2476,18 +2476,19 @@ int librados::Rados::get_pool_stats(std::list<string>& v,
                                    stats_map& result)
 {
   map<string,::pool_stat_t> rawresult;
-  int r = client->get_pool_stats(v, rawresult);
+  bool per_pool = false;
+  int r = client->get_pool_stats(v, &rawresult, &per_pool);
   for (map<string,::pool_stat_t>::iterator p = rawresult.begin();
        p != rawresult.end();
        ++p) {
     pool_stat_t& pv = result[p->first];
     auto& pstat = p->second;
     store_statfs_t &statfs = pstat.store_stats;
-    uint64_t allocated_bytes = pstat.get_allocated_bytes();
+    uint64_t allocated_bytes = pstat.get_allocated_bytes(per_pool);
     // FIXME: raw_used_rate is unknown hence use 1.0 here
     // meaning we keep net amount aggregated over all replicas
     // Not a big deal so far since this field isn't exposed
-    uint64_t user_bytes = pstat.get_user_bytes(1.0);
+    uint64_t user_bytes = pstat.get_user_bytes(1.0, per_pool);
 
     object_stat_sum_t *sum = &p->second.stats.sum;
     pv.num_kb = shift_round_up(allocated_bytes, 10);