update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/mon/MgrMonitor.h b/ceph/src/mon/MgrMonitor.h
index 6ef23030265a4149690a376af078ed344c9770b1..6f1d4e1bf84cbb5cd5555ea3d8ebc6c5e0b04c3a 100644 (file)
--- a/ceph/src/mon/MgrMonitor.h
+++ b/ceph/src/mon/MgrMonitor.h
@@ -31,6 +31,9 @@ class MgrMonitor: public PaxosService
   std::map<std::string, bufferlist> pending_metadata;
   std::set<std::string>             pending_metadata_rm;
 
+  std::map<std::string,Option> mgr_module_options;
+  std::list<std::string> misc_option_strings;
+
   utime_t first_seen_inactive;
 
   std::map<uint64_t, ceph::coarse_mono_clock::time_point> last_beacon;
@@ -57,6 +60,8 @@ class MgrMonitor: public PaxosService
   Context *digest_event = nullptr;
   void cancel_timer();
 
+  std::vector<health_check_map_t> prev_health_checks;
+
   bool check_caps(MonOpRequestRef op, const uuid_d& fsid);
 
   health_status_t should_warn_about_mgr_down();
@@ -76,13 +81,21 @@ public:
 
   const MgrMap &get_map() const { return map; }
 
+  const std::map<std::string,Option>& get_mgr_module_options() {
+    return mgr_module_options;
+  }
+  const Option *find_module_option(const string& name);
+
   bool in_use() const { return map.epoch > 0; }
 
-  version_t get_trim_to() override;
+  version_t get_trim_to() const override;
+
+  void prime_mgr_client();
 
   void create_initial() override;
-  void get_store_prefixes(std::set<string>& s) override;
+  void get_store_prefixes(std::set<string>& s) const override;
   void update_from_paxos(bool *need_bootstrap) override;
+  void post_paxos_update() override;
   void create_pending() override;
   void encode_pending(MonitorDBStore::TransactionRef t) override;
 
@@ -104,9 +117,6 @@ public:
   void on_active() override;
   void on_restart() override;
 
-  void get_health(list<pair<health_status_t,string> >& summary,
-                 list<pair<health_status_t,string> > *detail,
-                 CephContext *cct) const override;
   void tick() override;
 
   void print_summary(Formatter *f, std::ostream *ss) const;
@@ -114,13 +124,12 @@ public:
   const std::vector<MonCommand> &get_command_descs() const;
 
   int load_metadata(const string& name, std::map<string, string>& m,
-                   ostream *err);
+                   ostream *err) const;
   int dump_metadata(const string& name, Formatter *f, ostream *err);
+  void print_nodes(Formatter *f) const;
   void count_metadata(const string& field, Formatter *f);
   void count_metadata(const string& field, std::map<string,int> *out);
 
-  friend class C_Updated;
-
   // When did the mon last call into our tick() method?  Used for detecting
   // when the mon was not updating us for some period (e.g. during slow
   // election) to reset last_beacon timeouts