From 2c82b9c9fb5fc30c8aa29edc113d5180435e0855 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 14 Mar 2017 16:11:04 -0700 Subject: [PATCH] mon: FSCommands gets pool stats via PGService Signed-off-by: Greg Farnum --- src/mon/FSCommands.cc | 2 +- src/mon/PGStatService.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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; + } }; -- 2.39.5