From a6e669c4d57acd4a264d67a18eedbdcef57fed4b Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Thu, 4 May 2017 21:42:24 -0700 Subject: [PATCH] mon: give PGStatService a process_pg_command indirection Signed-off-by: Greg Farnum --- src/mon/OSDMonitor.cc | 8 ++++---- src/mon/PGStatService.h | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index f79217b53d041..1a2c1907125b9 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3960,8 +3960,8 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } else if (prefix == "osd perf" || prefix == "osd blocked-by") { - r = process_pg_map_command(prefix, cmdmap, mon->pgservice->get_pg_map(), - osdmap, f.get(), &ss, &rdata); + r = mon->pgservice->process_pg_command(prefix, cmdmap, + osdmap, f.get(), &ss, &rdata); } else if (prefix == "osd dump" || prefix == "osd tree" || @@ -4851,8 +4851,8 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } r = 0; } else if (prefix == "osd pool stats") { - r = process_pg_map_command(prefix, cmdmap, mon->pgservice->get_pg_map(), - osdmap, f.get(), &ss, &rdata); + r = mon->pgservice->process_pg_command(prefix, cmdmap, + 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 656b44cbc9fac..b6a64457e51c4 100644 --- a/src/mon/PGStatService.h +++ b/src/mon/PGStatService.h @@ -96,6 +96,15 @@ public: bool verbose) const { parent.dump_pool_stats(osdm, ss, f, verbose); } + + int process_pg_command(const string& prefix, + const map& cmdmap, + const OSDMap& osdmap, + Formatter *f, + stringstream *ss, + bufferlist *odata) { + return process_pg_map_command(prefix, cmdmap, parent, osdmap, f, ss, odata); + } }; -- 2.39.5