mgr: create shell OSD performance query class

Signed-off-by: Mykola Golub <mgolub@suse.com>

diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
index 925d02d0f99d725031c96243cccfb37f893f2dc0..f7fb4f9cb5a0aef875ee7bf4dc1dab80457d1c6a 100644 (file)
--- a/src/mgr/CMakeLists.txt
+++ b/src/mgr/CMakeLists.txt
@@ -12,6 +12,8 @@ set(mgr_srcs
   Gil.cc
   Mgr.cc
   MgrStandby.cc
+  OSDPerfMetricQuery.cc
+  OSDPerfMetricCollector.cc
   PyFormatter.cc
   PyModule.cc
   PyModuleRegistry.cc

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index b071b21cf05615df2689b1901a4770d835aec8f3..4e2f0b4bac29a41b7b8c9b5e0ebe5dfcff5f8e25 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -21,6 +21,7 @@
 
 #include "mgr/mgr_commands.h"
 #include "mgr/DaemonHealthMetricCollector.h"
+#include "mgr/OSDPerfMetricCollector.h"
 #include "mon/MonCommand.h"
 
 #include "messages/MMgrOpen.h"
@@ -87,7 +88,9 @@ DaemonServer::DaemonServer(MonClient *monc_,
       pgmap_ready(false),
       timer(g_ceph_context, lock),
       shutting_down(false),
-      tick_event(nullptr)
+      tick_event(nullptr),
+      osd_perf_metric_collector_listener(this),
+      osd_perf_metric_collector(osd_perf_metric_collector_listener)
 {
   g_conf().add_observer(this);
 }
@@ -388,6 +391,22 @@ void DaemonServer::schedule_tick(double delay_sec)
   schedule_tick_locked(delay_sec);
 }
 
+void DaemonServer::handle_osd_perf_metric_query_updated()
+{
+  dout(10) << dendl;
+
+  // Send a fresh MMgrConfigure to all clients, so that they can follow
+  // the new policy for transmitting stats
+  finisher.queue(new FunctionContext([this](int r) {
+        Mutex::Locker l(lock);
+        for (auto &c : daemon_connections) {
+          if (c->peer_is_osd()) {
+            _send_configure(c);
+          }
+        }
+      }));
+}
+
 void DaemonServer::shutdown()
 {
   dout(10) << "begin" << dendl;
@@ -2508,16 +2527,25 @@ void DaemonServer::_send_configure(ConnectionRef c)
 {
   ceph_assert(lock.is_locked_by_me());
 
-  OSDPerfMetricQuery query;
-
   auto configure = new MMgrConfigure();
   configure->stats_period = g_conf().get_val<int64_t>("mgr_stats_period");
   configure->stats_threshold = g_conf().get_val<int64_t>("mgr_stats_threshold");
 
   if (c->peer_is_osd()) {
-    configure->osd_perf_metric_queries.push_back(query);
+    configure->osd_perf_metric_queries =
+        osd_perf_metric_collector.get_queries();
   }
 
   c->send_message(configure);
 }
 
+OSDPerfMetricQueryID DaemonServer::add_osd_perf_query(
+  const OSDPerfMetricQuery &query)
+{
+  return osd_perf_metric_collector.add_query(query);
+}
+
+int DaemonServer::remove_osd_perf_query(OSDPerfMetricQueryID query_id)
+{
+  return osd_perf_metric_collector.remove_query(query_id);
+}

diff --git a/src/mgr/DaemonServer.h b/src/mgr/DaemonServer.h
index aa522612b0b8ca09b02d97eff3c2312564d25d2d..2caad3b6f642d562ba529b79c04cb244b775cb96 100644 (file)
--- a/src/mgr/DaemonServer.h
+++ b/src/mgr/DaemonServer.h
@@ -31,6 +31,7 @@
 #include "ServiceMap.h"
 #include "MgrSession.h"
 #include "DaemonState.h"
+#include "OSDPerfMetricCollector.h"
 
 class MMgrReport;
 class MMgrOpen;
@@ -39,6 +40,7 @@ class MMonMgrReport;
 class MCommand;
 struct MonCommand;
 class CommandContext;
+struct OSDPerfMetricQuery;
 
 
 /**
@@ -111,6 +113,22 @@ private:
   void tick();
   void schedule_tick_locked(double delay_sec);
 
+  class OSDPerfMetricCollectorListener :
+      public OSDPerfMetricCollector::Listener {
+  public:
+    OSDPerfMetricCollectorListener(DaemonServer *server)
+      : server(server) {
+    }
+    void handle_query_updated() override {
+      server->handle_osd_perf_metric_query_updated();
+    }
+  private:
+    DaemonServer *server;
+  };
+  OSDPerfMetricCollectorListener osd_perf_metric_collector_listener;
+  OSDPerfMetricCollector osd_perf_metric_collector;
+  void handle_osd_perf_metric_query_updated();
+
 public:
   int init(uint64_t gid, entity_addrvec_t client_addrs);
   void shutdown();
@@ -154,6 +172,9 @@ public:
 
   void _send_configure(ConnectionRef c);
 
+  OSDPerfMetricQueryID add_osd_perf_query(const OSDPerfMetricQuery &query);
+  int remove_osd_perf_query(OSDPerfMetricQueryID query_id);
+
   virtual const char** get_tracked_conf_keys() const override;
   virtual void handle_conf_change(const ConfigProxy& conf,
                           const std::set <std::string> &changed) override;

diff --git a/src/mgr/OSDPerfMetricCollector.cc b/src/mgr/OSDPerfMetricCollector.cc
new file mode 100644 (file)
index 0000000..ca28bcc
--- /dev/null
+++ b/src/mgr/OSDPerfMetricCollector.cc
@@ -0,0 +1,104 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#include "common/debug.h"
+#include "common/errno.h"
+
+#include "OSDPerfMetricCollector.h"
+
+#define dout_context g_ceph_context
+#define dout_subsys ceph_subsys_mgr
+#undef dout_prefix
+#define dout_prefix *_dout << "mgr.osd_perf_metric_collector " << __func__ << " "
+
+OSDPerfMetricCollector::OSDPerfMetricCollector(Listener &listener)
+  : listener(listener), lock("OSDPerfMetricCollector::lock") {
+}
+
+std::list<OSDPerfMetricQuery> OSDPerfMetricCollector::get_queries() {
+  Mutex::Locker locker(lock);
+
+  std::list<OSDPerfMetricQuery> query_list;
+  for (auto &it : queries) {
+    query_list.push_back(it.first);
+  }
+
+  return query_list;
+}
+
+int OSDPerfMetricCollector::add_query(const OSDPerfMetricQuery& query) {
+  uint64_t query_id;
+  bool notify = false;
+
+  {
+    Mutex::Locker locker(lock);
+
+    query_id = next_query_id++;
+    auto it = queries.find(query);
+    if (it == queries.end()) {
+      it = queries.insert({query, {}}).first;
+      notify = true;
+    }
+    it->second.insert(query_id);
+  }
+
+  dout(10) << query << " query_id=" << query_id << dendl;
+
+  if (notify) {
+    listener.handle_query_updated();
+  }
+
+  return query_id;
+}
+
+int OSDPerfMetricCollector::remove_query(int query_id) {
+  bool found = false;
+  bool notify = false;
+
+  {
+    Mutex::Locker locker(lock);
+
+    for (auto it = queries.begin() ; it != queries.end(); it++) {
+      auto &ids = it->second;
+
+      if (ids.erase(query_id) > 0) {
+        if (ids.empty()) {
+          queries.erase(it);
+          notify = true;
+        }
+        found = true;
+        break;
+      }
+    }
+  }
+
+  if (!found) {
+    dout(10) << query_id << " not found" << dendl;
+    return -ENOENT;
+  }
+
+  dout(10) << query_id << dendl;
+
+  if (notify) {
+    listener.handle_query_updated();
+  }
+
+  return 0;
+}
+
+void OSDPerfMetricCollector::remove_all_queries() {
+  dout(10) << dendl;
+
+  bool notify;
+
+  {
+    Mutex::Locker locker(lock);
+
+    notify = !queries.empty();
+    queries.clear();
+  }
+
+  if (notify) {
+    listener.handle_query_updated();
+  }
+}

diff --git a/src/mgr/OSDPerfMetricCollector.h b/src/mgr/OSDPerfMetricCollector.h
new file mode 100644 (file)
index 0000000..8035da4
--- /dev/null
+++ b/src/mgr/OSDPerfMetricCollector.h
@@ -0,0 +1,43 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#ifndef OSD_PERF_METRIC_COLLECTOR_H_
+#define OSD_PERF_METRIC_COLLECTOR_H_
+
+#include "common/Mutex.h"
+
+#include "mgr/OSDPerfMetricQuery.h"
+
+#include <list>
+#include <set>
+
+/**
+ * OSD performance query class.
+ */
+class OSDPerfMetricCollector {
+public:
+  struct Listener {
+    virtual ~Listener() {
+    }
+
+    virtual void handle_query_updated() = 0;
+  };
+
+  OSDPerfMetricCollector(Listener &listener);
+
+  std::list<OSDPerfMetricQuery> get_queries();
+
+  OSDPerfMetricQueryID add_query(const OSDPerfMetricQuery& query);
+  int remove_query(OSDPerfMetricQueryID query_id);
+  void remove_all_queries();
+
+private:
+  typedef std::map<OSDPerfMetricQuery, std::set<OSDPerfMetricQueryID>> Queries;
+
+  Listener &listener;
+  mutable Mutex lock;
+  OSDPerfMetricQueryID next_query_id = 0;
+  Queries queries;
+};
+
+#endif // OSD_PERF_METRIC_COLLECTOR_H_

diff --git a/src/mgr/OSDPerfMetricQuery.cc b/src/mgr/OSDPerfMetricQuery.cc
new file mode 100644 (file)
index 0000000..9b13f69
--- /dev/null
+++ b/src/mgr/OSDPerfMetricQuery.cc
@@ -0,0 +1,8 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#include "OSDPerfMetricQuery.h"
+
+std::ostream& operator<<(std::ostream& os, const OSDPerfMetricQuery &query) {
+  return os << "simple";
+}

diff --git a/src/mgr/OSDPerfMetricQuery.h b/src/mgr/OSDPerfMetricQuery.h
index f5640956d25bdc1ab65619bcd904aa6a4049dac2..708297204897db8b54d561e6cb12c82f2e95cc08 100644 (file)
--- a/src/mgr/OSDPerfMetricQuery.h
+++ b/src/mgr/OSDPerfMetricQuery.h
@@ -10,14 +10,17 @@ typedef int OSDPerfMetricQueryID;
 
 struct OSDPerfMetricQuery
 {
-  OSDPerfMetricQueryID query_id;
+  bool operator<(const OSDPerfMetricQuery &other) const {
+    return false;
+  }
 
   DENC(OSDPerfMetricQuery, v, p) {
-      DENC_START(1, 1, p);
-      denc(v.query_id, p);
-      DENC_FINISH(p);
+    DENC_START(1, 1, p);
+    DENC_FINISH(p);
   }
 };
 WRITE_CLASS_DENC(OSDPerfMetricQuery)
 
+std::ostream& operator<<(std::ostream& os, const OSDPerfMetricQuery &query);
+
 #endif // OSD_PERF_METRIC_QUERY_H_