update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/mon/LogMonitor.h b/ceph/src/mon/LogMonitor.h
index 0bb5e366cb905b456d35a41104900529e48f535a..215ef485e5a7715a14eae1a426839b90d940f73b 100644 (file)
--- a/ceph/src/mon/LogMonitor.h
+++ b/ceph/src/mon/LogMonitor.h
@@ -17,15 +17,14 @@
 
 #include <map>
 #include <set>
-using namespace std;
 
 #include "include/types.h"
 #include "PaxosService.h"
 
+#include "common/config_fwd.h"
 #include "common/LogEntry.h"
 #include "include/str_map.h"
 
-class MMonCommand;
 class MLog;
 
 static const string LOG_META_CHANNEL = "$channel";
@@ -136,7 +135,7 @@ private:
   // propose pending update to peers
   void encode_pending(MonitorDBStore::TransactionRef t) override;
   void encode_full(MonitorDBStore::TransactionRef t) override;
-  version_t get_trim_to() override;
+  version_t get_trim_to() const override;
   bool preprocess_query(MonOpRequestRef op) override;  // true if processed.
   bool prepare_update(MonOpRequestRef op) override;
 
@@ -156,7 +155,6 @@ private:
   bool preprocess_command(MonOpRequestRef op);
   bool prepare_command(MonOpRequestRef op);
 
-  bool _create_sub_summary(MLog *mlog, int level);
   void _create_sub_incremental(MLog *mlog, int level, version_t sv);
 
  public:
@@ -165,7 +163,7 @@ private:
 
   void init() override {
     generic_dout(10) << "LogMonitor::init" << dendl;
-    g_conf->add_observer(this);
+    g_conf().add_observer(this);
     update_log_channels();
   }
   
@@ -183,7 +181,7 @@ private:
   int sub_name_to_id(const string& n);
 
   void on_shutdown() override {
-    g_conf->remove_observer(this);
+    g_conf().remove_observer(this);
   }
 
   const char **get_tracked_conf_keys() const override {
@@ -200,7 +198,7 @@ private:
     };
     return KEYS;
   }
-  void handle_conf_change(const struct md_config_t *conf,
+  void handle_conf_change(const ConfigProxy& conf,
                           const std::set<std::string> &changed) override;
 };
 #endif