update sources to v12.1.1

[ceph.git] / ceph / src / mon / MgrStatMonitor.h

diff --git a/ceph/src/mon/MgrStatMonitor.h b/ceph/src/mon/MgrStatMonitor.h
index 7ecbc9d377f5d53d6528109bba305f343790ee07..c1846a5447798e8fc2a3258581dd4b6da8f86270 100644 (file)
--- a/ceph/src/mon/MgrStatMonitor.h
+++ b/ceph/src/mon/MgrStatMonitor.h
@@ -6,6 +6,7 @@
 #include "include/Context.h"
 #include "PaxosService.h"
 #include "mon/PGMap.h"
+#include "mgr/ServiceMap.h"
 
 class MonPGStatService;
 class MgrPGStatService;
@@ -14,13 +15,12 @@ class MgrStatMonitor : public PaxosService {
   // live version
   version_t version = 0;
   PGMapDigest digest;
-  list<pair<health_status_t,string>> health_summary;
-  list<pair<health_status_t,string>> health_detail;
+  ServiceMap service_map;
 
   // pending commit
   PGMapDigest pending_digest;
-  list<pair<health_status_t,string>> pending_health_summary;
-  list<pair<health_status_t,string>> pending_health_detail;
+  health_check_map_t pending_health_checks;
+  bufferlist pending_service_map_bl;
 
   std::unique_ptr<MgrPGStatService> pgservice;
 
@@ -62,10 +62,14 @@ public:
     return digest.get_last_osd_stat_seq(osd);
   }
 
+  void update_logger();
 
   void print_summary(Formatter *f, std::ostream *ss) const;
 
   MonPGStatService *get_pg_stat_service();
+  const ServiceMap& get_service_map() {
+    return service_map;
+  }
 
   friend class C_Updated;
 };