mon: FSCommands gets pool stats via PGService

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc
index 193413fd75bd8031085db26119c63b6ba8b1ef02..fb7fae3afd644aade0f3888643c50f8d8baa6a6c 100644 (file)
--- a/src/mon/FSCommands.cc
+++ b/src/mon/FSCommands.cc
@@ -102,7 +102,7 @@ class FsNewHandler : public FileSystemCommandHandler
 
     string force;
     cmd_getval(g_ceph_context,cmdmap, "force", force);
-    int64_t metadata_num_objects = mon->pgmon()->pg_map.pg_pool_sum[metadata].stats.sum.num_objects;
+    int64_t metadata_num_objects = mon->pgservice.get_pool_stat(metadata).stats.sum.num_objects;
     if (force != "--force" && metadata_num_objects > 0) {
       ss << "pool '" << metadata_name
         << "' already contains some objects. Use an empty pool instead.";

diff --git a/src/mon/PGStatService.h b/src/mon/PGStatService.h
index ad13a176fe8d723f50262ffb7f15fa8cf2e23ec3..5da2cce8f641a75737ccb68eca35e8c82e6aa315 100644 (file)
--- a/src/mon/PGStatService.h
+++ b/src/mon/PGStatService.h
@@ -42,6 +42,11 @@ public:
   void reset(const PGMap& o) {
     parent = o;
   }
+  const pool_stat_t& get_pool_stat(int poolid) const {
+    auto i = parent.pg_pool_sum.find(poolid);
+    assert(i != parent.pg_pool_sum.end());
+    return i->second;
+  }
 };