mon: give PGStatService a process_pg_command indirection

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f79217b53d0418a9b3ee4e68ec46da808dfb5746..1a2c1907125b937007f82ce175dfcda311626167 100644 (file)
--- 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 656b44cbc9fac2c3386005a80ae06b490bac2dad..b6a64457e51c4bbe9af3c0c31f8aa7979a3f6c3a 100644 (file)
--- 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<string,cmd_vartype>& cmdmap,
+                        const OSDMap& osdmap,
+                        Formatter *f,
+                        stringstream *ss,
+                        bufferlist *odata) {
+    return process_pg_map_command(prefix, cmdmap, parent, osdmap, f, ss, odata);
+  }
 };