From 3109da269fce99bcc29baec48256515d3703d2c9 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 18 May 2017 19:58:50 +0800 Subject: [PATCH] mon: move dump_info() to PGStatService Signed-off-by: Kefu Chai --- src/mon/MgrStatMonitor.cc | 4 ++++ src/mon/Monitor.cc | 2 +- src/mon/PGMonitor.cc | 15 +++++---------- src/mon/PGMonitor.h | 2 -- src/mon/PGStatService.h | 1 + 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc index 00ac773e620..9e9dafc01bf 100644 --- a/src/mon/MgrStatMonitor.cc +++ b/src/mon/MgrStatMonitor.cc @@ -45,6 +45,9 @@ public: void print_summary(Formatter *f, ostream *out) const override { digest.print_summary(f, out); } + void dump_info(Formatter *f) const override { + digest.dump(f); + } void dump_fs_stats(stringstream *ss, Formatter *f, bool verbose) const override { @@ -129,6 +132,7 @@ void MgrStatMonitor::tick() void MgrStatMonitor::print_summary(Formatter *f, std::ostream *ss) const { + pgservice->print_summary(f, ss); } bool MgrStatMonitor::preprocess_query(MonOpRequestRef op) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 9d39f3be792..5c3b1d8edb7 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -3133,8 +3133,8 @@ void Monitor::handle_command(MonOpRequestRef op) monmon()->dump_info(f.get()); osdmon()->dump_info(f.get()); mdsmon()->dump_info(f.get()); - pgmon()->dump_info(f.get()); authmon()->dump_info(f.get()); + pgservice->dump_info(f.get()); paxos->dump_info(f.get()); diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 48a7c0834f6..05199dd2a29 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -929,16 +929,6 @@ epoch_t PGMonitor::send_pg_creates(int osd, Connection *con, epoch_t next) return last + 1; } -void PGMonitor::dump_info(Formatter *f) const -{ - f->open_object_section("pgmap"); - pg_map.dump(f); - f->close_section(); - - f->dump_unsigned("pgmap_first_committed", get_first_committed()); - f->dump_unsigned("pgmap_last_committed", get_last_committed()); -} - bool PGMonitor::preprocess_command(MonOpRequestRef op) { op->mark_pgmon_event(__func__); @@ -1280,6 +1270,11 @@ public: void print_summary(Formatter *f, ostream *out) const override { pgmap.print_summary(f, out); } + void dump_info(Formatter *f) const override { + f->dump_object("pgmap", pgmap); + f->dump_unsigned("pgmap_first_committed", pgmon->get_first_committed()); + f->dump_unsigned("pgmap_last_committed", pgmon->get_last_committed()); + } void dump_fs_stats(stringstream *ss, Formatter *f, bool verbose) const override { diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h index 347fc8f4a61..6ba82ea12b5 100644 --- a/src/mon/PGMonitor.h +++ b/src/mon/PGMonitor.h @@ -115,8 +115,6 @@ public: void check_osd_map(epoch_t epoch); - void dump_info(Formatter *f) const; - int _warn_slow_request_histogram(const pow2_hist_t& h, string suffix, list >& summary, list > *detail) const; diff --git a/src/mon/PGStatService.h b/src/mon/PGStatService.h index 4064b109ea9..63ed09844d8 100644 --- a/src/mon/PGStatService.h +++ b/src/mon/PGStatService.h @@ -84,6 +84,7 @@ public: virtual size_t get_num_pg_by_osd(int osd) const = 0; virtual void print_summary(Formatter *f, ostream *out) const = 0; + virtual void dump_info(Formatter *f) const = 0; virtual void dump_fs_stats(stringstream *ss, Formatter *f, bool verbose) const = 0; virtual void dump_pool_stats(const OSDMap& osdm, stringstream *ss, Formatter *f, bool verbose) const = 0; -- 2.39.5