mgr/DaemonState: forward-declare class DaemonHealthMetric

This requires un-inlining constructor and destructor.

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/mgr/DaemonState.cc b/src/mgr/DaemonState.cc
index 965bba4ad424d4f50de5214a5263ac6a03a62e9c..685e83a7e527406c43990f68d5b3c065922dd036 100644 (file)
--- a/src/mgr/DaemonState.cc
+++ b/src/mgr/DaemonState.cc
@@ -38,6 +38,13 @@ using std::string;
 using std::stringstream;
 using std::unique_ptr;
 
+DaemonState::DaemonState(PerfCounterTypes &types_)
+    : perf_counters(types_)
+{
+}
+
+DaemonState::~DaemonState() noexcept = default;
+
 void DeviceState::set_metadata(map<string,string>&& m)
 {
   metadata = std::move(m);

diff --git a/src/mgr/DaemonState.h b/src/mgr/DaemonState.h
index fca31ac9e6528bd8c09093c8592b174ae6c289ca..d19ea7de3740708462336807ab7a69ddf6cda3b9 100644 (file)
--- a/src/mgr/DaemonState.h
+++ b/src/mgr/DaemonState.h
@@ -28,7 +28,6 @@
 
 #include "msg/msg_types.h"
 
-#include "DaemonHealthMetric.h"
 #include "DaemonKey.h"
 #include "DaemonPerfCounters.h"
 
@@ -36,6 +35,8 @@ namespace ceph {
   class Formatter;
 }
 
+class DaemonHealthMetric;
+
 // The state that we store about one daemon
 class DaemonState
 {
@@ -79,10 +80,9 @@ class DaemonState
   // The perf counters received in MMgrReport messages
   DaemonPerfCounters perf_counters;
 
-  explicit DaemonState(PerfCounterTypes &types_)
-    : perf_counters(types_)
-  {
-  }
+  explicit DaemonState(PerfCounterTypes &types_);
+  ~DaemonState() noexcept;
+
   void set_metadata(const std::map<std::string,std::string>& m);
   const std::map<std::string,std::string>& _get_config_defaults();
 };

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 2d9b86106886b8d24ebc8f80010ddd11a4b69a4c..50fb01fce48e6f0fd10e22d0c0d58fc4dc070821 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -41,6 +41,7 @@
 #include "JSONCommand.h"
 #include "PyModule.h"
 #include "Mgr.h"
+#include "DaemonHealthMetric.h" // for accessing DaemonState::daemon_health_metrics
 
 #include <sstream>