From 44e0228ad52dc45e22c16e30811043d2779d4277 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 14 Mar 2017 17:18:36 -0700 Subject: [PATCH] mon: yet more OSDMonitor dep-pgmap-ification Signed-off-by: Greg Farnum --- src/mon/OSDMonitor.cc | 5 ++--- src/mon/PGStatService.h | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index e03c7e1bcd4..b90115ffe38 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -4854,9 +4854,8 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } r = 0; } else if (prefix == "osd pool stats") { - const auto &pgm = mon->pgmon()->pg_map; - r = process_pg_map_command(prefix, cmdmap, pgm, osdmap, - f.get(), &ss, &rdata); + r = process_pg_map_command(prefix, cmdmap, mon->pgservice.get_pg_map(), + osdmap, f.get(), &ss, &rdata); } else if (prefix == "osd pool get-quota") { string pool_name; cmd_getval(g_ceph_context, cmdmap, "pool", pool_name); diff --git a/src/mon/PGStatService.h b/src/mon/PGStatService.h index 660ad9e50f7..357d18c0020 100644 --- a/src/mon/PGStatService.h +++ b/src/mon/PGStatService.h @@ -67,6 +67,15 @@ public: bool have_full_osds() const { return !parent.full_osds.empty(); } bool have_nearfull_osds() const { return !parent.nearfull_osds.empty(); } + + void print_summary(Formatter *f, ostream *out) const { parent.print_summary(f, out); } + void dump_fs_stats(stringstream *ss, Formatter *f, bool verbose) const { + parent.dump_fs_stats(ss, f, verbose); + } + void dump_pool_stats(const OSDMap& osdm, stringstream *ss, Formatter *f, + bool verbose) const { + parent.dump_pool_stats(osdm, ss, f, verbose); + } }; -- 2.39.5