From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 14 Mar 2017 23:11:04 +0000 (-0700)
Subject: mon: FSCommands gets pool stats via PGService
X-Git-Tag: v12.1.0~288^2~122
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2c82b9c9fb5fc30c8aa29edc113d5180435e0855;p=ceph-ci.git

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 193413fd75b..fb7fae3afd6 100644
--- 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 ad13a176fe8..5da2cce8f64 100644
--- 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;
+  }
 };