mon: drop pgservice member

Just use mgrstatmon() directly.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc
index 1841d398067080d5dbce0beccab5fb0d1924724f..b44061373c35367401c42240ae516991bc21cdf5 100644 (file)
--- a/src/mon/FSCommands.cc
+++ b/src/mon/FSCommands.cc
@@ -17,6 +17,7 @@
 
 #include "FSCommands.h"
 #include "MDSMonitor.h"
+#include "MgrStatMonitor.h"
 
 
 
@@ -108,7 +109,7 @@ class FsNewHandler : public FileSystemCommandHandler
     string force_str;
     cmd_getval(g_ceph_context,cmdmap, "force", force_str);
     bool force = (force_str == "--force");
-    const pool_stat_t *stat = mon->pgservice->get_pool_stat(metadata);
+    const pool_stat_t *stat = mon->mgrstatmon()->get_pool_stat(metadata);
     if (stat) {
       int64_t metadata_num_objects = stat->stats.sum.num_objects;
       if (!force && metadata_num_objects > 0) {

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 8539d1166fa35ad54c5b9c8dc6d5612f5e09c114..a65d1fbe9dd163365c083aea29172845b8d9ed9e 100755 (executable)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -142,7 +142,6 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s,
                        cct->_conf->auth_service_required : cct->_conf->auth_supported ),
   mgr_messenger(mgr_m),
   mgr_client(cct_, mgr_m),
-  pgservice(nullptr),
   store(s),
   
   state(STATE_PROBING),
@@ -210,9 +209,6 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s,
   // actually matters will wait until we have quorum etc and then
   // retry (and revalidate).
   leader_mon_commands = local_mon_commands;
-
-  // note: OSDMonitor may update this based on the luminous flag.
-  pgservice = mgrstatmon();
 }
 
 Monitor::~Monitor()
@@ -2644,7 +2640,7 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f)
     osdmon()->osdmap.print_summary(f, cout, string(12, ' '));
     f->close_section();
     f->open_object_section("pgmap");
-    pgservice->print_summary(f, NULL);
+    mgrstatmon()->print_summary(f, NULL);
     f->close_section();
     f->open_object_section("fsmap");
     mdsmon()->get_fsmap().print_summary(f, NULL);
@@ -2705,7 +2701,7 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f)
     }
 
     ss << "\n \n  data:\n";
-    pgservice->print_summary(NULL, &ss);
+    mgrstatmon()->print_summary(NULL, &ss);
     ss << "\n ";
   }
 }
@@ -3193,10 +3189,10 @@ void Monitor::handle_command(MonOpRequestRef op)
       if (f)
         f->open_object_section("stats");
 
-      pgservice->dump_fs_stats(&ds, f.get(), verbose);
+      mgrstatmon()->dump_fs_stats(&ds, f.get(), verbose);
       if (!f)
         ds << '\n';
-      pgservice->dump_pool_stats(osdmon()->osdmap, &ds, f.get(), verbose);
+      mgrstatmon()->dump_pool_stats(osdmon()->osdmap, &ds, f.get(), verbose);
 
       if (f) {
         f->close_section();
@@ -3234,7 +3230,7 @@ void Monitor::handle_command(MonOpRequestRef op)
     osdmon()->dump_info(f.get());
     mdsmon()->dump_info(f.get());
     authmon()->dump_info(f.get());
-    pgservice->dump_info(f.get());
+    mgrstatmon()->dump_info(f.get());
 
     paxos->dump_info(f.get());
 

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 3aa63abf3fb0f6007a9c27de79415dfe6786e1d0..c3fe86692a2d380442a760b4fc8232153fc9538e 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -173,8 +173,6 @@ public:
   MgrClient mgr_client;
   uint64_t mgr_proxy_bytes = 0;  // in-flight proxied mgr command message bytes
 
-  const PGStatService *pgservice;
-
 private:
   void new_tick();
 

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 0b86eedf990c37793358d6418afdd306887a3ff8..c7fd3e4389cd698c9d4bb846f65dc381c648cbba 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1037,7 +1037,7 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t)
             pg_pool.last_change = pending_inc.epoch;
             pending_inc.new_pools[pool_id] = pg_pool;
           } else if (match_count > 1) {
-            auto pstat = mon->pgservice->get_pool_stat(pool_id);
+            auto pstat = mon->mgrstatmon()->get_pool_stat(pool_id);
             if (pstat != nullptr && pstat->stats.sum.num_objects > 0) {
               mon->clog->info() << "unable to auto-enable application for pool "
                                 << "'" << pool_name << "'";
@@ -4838,7 +4838,7 @@ bool OSDMonitor::update_pools_status()
 
   auto& pools = osdmap.get_pools();
   for (auto it = pools.begin(); it != pools.end(); ++it) {
-    const pool_stat_t *pstat = mon->pgservice->get_pool_stat(it->first);
+    const pool_stat_t *pstat = mon->mgrstatmon()->get_pool_stat(it->first);
     if (!pstat)
       continue;
     const object_stat_sum_t& sum = pstat->stats.sum;
@@ -10061,7 +10061,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
     // make sure new tier is empty
     string force_nonempty;
     cmd_getval(g_ceph_context, cmdmap, "force_nonempty", force_nonempty);
-    const pool_stat_t *pstats = mon->pgservice->get_pool_stat(tierpool_id);
+    const pool_stat_t *pstats = mon->mgrstatmon()->get_pool_stat(tierpool_id);
     if (pstats && pstats->stats.sum.num_objects != 0 &&
        force_nonempty != "--force-nonempty") {
       ss << "tier pool '" << tierpoolstr << "' is not empty; --force-nonempty to force";
@@ -10375,7 +10375,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
          mode != pg_pool_t::CACHEMODE_READPROXY))) {
 
       const pool_stat_t* pstats =
-        mon->pgservice->get_pool_stat(pool_id);
+        mon->mgrstatmon()->get_pool_stat(pool_id);
 
       if (pstats && pstats->stats.sum.num_objects_dirty > 0) {
         ss << "unable to set cache-mode '"
@@ -10443,7 +10443,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
     }
     // make sure new tier is empty
     const pool_stat_t *pstats =
-      mon->pgservice->get_pool_stat(tierpool_id);
+      mon->mgrstatmon()->get_pool_stat(tierpool_id);
     if (pstats && pstats->stats.sum.num_objects != 0) {
       ss << "tier pool '" << tierpoolstr << "' is not empty";
       err = -ENOTEMPTY;