update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / mgr / ActivePyModules.h

diff --git a/ceph/src/mgr/ActivePyModules.h b/ceph/src/mgr/ActivePyModules.h
index 21e6529a93343b0c66e225dafd9d50156467b794..758f94f06478cf815639bb6c916ea41b5d0a6eee 100644 (file)
--- a/ceph/src/mgr/ActivePyModules.h
+++ b/ceph/src/mgr/ActivePyModules.h
@@ -18,40 +18,48 @@
 #include "common/Finisher.h"
 #include "common/Mutex.h"
 
+#include "PyFormatter.h"
+
 #include "osdc/Objecter.h"
 #include "client/Client.h"
 #include "common/LogClient.h"
 #include "mon/MgrMap.h"
 #include "mon/MonCommand.h"
+#include "mon/mon_types.h"
 
 #include "DaemonState.h"
 #include "ClusterState.h"
+#include "OSDPerfMetricTypes.h"
 
 class health_check_map_t;
-
-typedef std::map<std::string, std::string> PyModuleConfig;
+class DaemonServer;
+class PyModuleRegistry;
 
 class ActivePyModules
 {
-
   std::map<std::string, std::unique_ptr<ActivePyModule>> modules;
-  PyModuleConfig config_cache;
+  PyModuleConfig &module_config;
+  std::map<std::string, std::string> store_cache;
   DaemonStateIndex &daemon_state;
   ClusterState &cluster_state;
   MonClient &monc;
-  LogChannelRef clog;
+  LogChannelRef clog, audit_clog;
   Objecter &objecter;
   Client   &client;
   Finisher &finisher;
+  DaemonServer &server;
+  PyModuleRegistry &py_module_registry;
 
+  map<std::string,ProgressEvent> progress_events;
 
   mutable Mutex lock{"ActivePyModules::lock"};
 
 public:
-  ActivePyModules(PyModuleConfig const &config_,
+  ActivePyModules(PyModuleConfig &module_config,
+            std::map<std::string, std::string> store_data,
             DaemonStateIndex &ds, ClusterState &cs, MonClient &mc,
-            LogChannelRef clog_, Objecter &objecter_, Client &client_,
-            Finisher &f);
+            LogChannelRef clog_, LogChannelRef audit_clog_, Objecter &objecter_, Client &client_,
+            Finisher &f, DaemonServer &server, PyModuleRegistry &pmr);
 
   ~ActivePyModules();
 
@@ -59,7 +67,6 @@ public:
   MonClient &get_monc() {return monc;}
   Objecter  &get_objecter() {return objecter;}
   Client    &get_client() {return client;}
-
   PyObject *get_python(const std::string &what);
   PyObject *get_server_python(const std::string &hostname);
   PyObject *list_servers_python();
@@ -71,30 +78,67 @@ public:
     const std::string &svc_type,
     const std::string &svc_id,
     const std::string &path);
+  PyObject *get_latest_counter_python(
+    const std::string &svc_type,
+    const std::string &svc_id,
+    const std::string &path);
   PyObject *get_perf_schema_python(
-     const std::string svc_type,
+     const std::string &svc_type,
      const std::string &svc_id);
   PyObject *get_context();
   PyObject *get_osdmap();
+  PyObject *with_perf_counters(
+      std::function<void(
+        PerfCounterInstance& counter_instance,
+        PerfCounterType& counter_type,
+        PyFormatter& f)> fct,
+      const std::string &svc_name,
+      const std::string &svc_id,
+      const std::string &path) const;
+
+  OSDPerfMetricQueryID add_osd_perf_query(
+      const OSDPerfMetricQuery &query,
+      const std::optional<OSDPerfMetricLimit> &limit);
+  void remove_osd_perf_query(OSDPerfMetricQueryID query_id);
+  PyObject *get_osd_perf_counters(OSDPerfMetricQueryID query_id);
+
+  bool get_store(const std::string &module_name,
+      const std::string &key, std::string *val) const;
+  PyObject *get_store_prefix(const std::string &module_name,
+                             const std::string &prefix) const;
+  void set_store(const std::string &module_name,
+      const std::string &key, const boost::optional<std::string> &val);
 
   bool get_config(const std::string &module_name,
       const std::string &key, std::string *val) const;
-  PyObject *get_config_prefix(const std::string &module_name,
-                             const std::string &prefix) const;
   void set_config(const std::string &module_name,
       const std::string &key, const boost::optional<std::string> &val);
 
+  PyObject *get_typed_config(const std::string &module_name,
+                            const std::string &key,
+                            const std::string &prefix = "") const;
+
   void set_health_checks(const std::string& module_name,
                         health_check_map_t&& checks);
   void get_health_checks(health_check_map_t *checks);
 
-  void set_uri(const std::string& module_name, const std::string &uri);
+  void update_progress_event(const std::string& evid,
+                            const std::string& desc,
+                            float progress);
+  void complete_progress_event(const std::string& evid);
+  void clear_all_progress_events();
+  void get_progress_events(std::map<std::string,ProgressEvent>* events);
 
-  // Python command definitions, including callback
-  std::vector<ModuleCommand> get_py_commands() const;
+  void config_notify();
 
-  // Monitor command definitions, suitable for CLI
-  std::vector<MonCommand> get_commands() const;
+  void set_uri(const std::string& module_name, const std::string &uri);
+
+  int handle_command(
+    const std::string &module_name,
+    const cmdmap_t &cmdmap,
+    const bufferlist &inbuf,
+    std::stringstream *ds,
+    std::stringstream *ss);
 
   std::map<std::string, std::string> get_services() const;
 
@@ -105,15 +149,34 @@ public:
                   const std::string &notify_id);
   void notify_all(const LogEntry &log_entry);
 
+  bool module_exists(const std::string &name) const
+  {
+    return modules.count(name) > 0;
+  }
+
+  bool method_exists(
+      const std::string &module_name,
+      const std::string &method_name) const
+  {
+    return modules.at(module_name)->method_exists(method_name);
+  }
+
+  PyObject *dispatch_remote(
+      const std::string &other_module,
+      const std::string &method,
+      PyObject *args,
+      PyObject *kwargs,
+      std::string *err);
+
   int init();
   void shutdown();
 
-  int start_one(std::string const &module_name,
-                PyObject *pClass,
-                const SafeThreadState &pMyThreadState);
+  void start_one(PyModuleRef py_module);
 
   void dump_server(const std::string &hostname,
                    const DaemonStateCollection &dmc,
                    Formatter *f);
-};
 
+  void cluster_log(const std::string &channel, clog_type prio,
+    const std::string &message);
+};