]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/HealthMonitor: remove unneeded include 10563/head
authorMichal Jarzabek <stiopa@gmail.com>
Wed, 3 Aug 2016 19:43:09 +0000 (20:43 +0100)
committerMichal Jarzabek <stiopa@gmail.com>
Mon, 19 Sep 2016 20:58:29 +0000 (21:58 +0100)
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
src/mon/HealthMonitor.cc
src/mon/HealthMonitor.h

index bfa4ca02bb3826bdda6619ccddc9eb60bdf4f9af..6e8e01e622bde68769c6cf3835ec14d44bf380e4 100644 (file)
@@ -21,8 +21,7 @@
 #include "include/assert.h"
 
 #include "mon/Monitor.h"
-// #include "mon/QuorumService.h"
-// #include "mon/HealthService.h"
+#include "mon/HealthService.h"
 #include "mon/HealthMonitor.h"
 #include "mon/DataHealthService.h"
 
@@ -66,6 +65,22 @@ bool HealthMonitor::service_dispatch(MonOpRequestRef op)
   return services[service_type]->service_dispatch(op);
 }
 
+void HealthMonitor::start_epoch() {
+  for (map<int,HealthService*>::iterator it = services.begin();
+       it != services.end(); ++it) {
+    it->second->start(get_epoch());
+  }
+}
+
+void HealthMonitor::finish_epoch() {
+  generic_dout(20) << "HealthMonitor::finish_epoch()" << dendl;
+  for (map<int,HealthService*>::iterator it = services.begin();
+       it != services.end(); ++it) {
+    assert(it->second != NULL);
+    it->second->finish();
+  }
+}
+
 void HealthMonitor::service_shutdown()
 {
   dout(0) << "HealthMonitor::service_shutdown "
index 4a7e3842bb24e1bbddcf8c7f08c375b579cab822..9fdc3251ffc7fb44565d589bd989ac79776a6755 100644 (file)
 #define CEPH_HEALTH_MONITOR_H
 
 #include "mon/QuorumService.h"
-#include "mon/HealthService.h"
 
 //forward declaration
 namespace ceph { class Formatter; }
+class HealthService;
 
 class HealthMonitor : public QuorumService
 {
@@ -44,21 +44,9 @@ public:
                  list<pair<health_status_t,string> > *detail) override;
   bool service_dispatch(MonOpRequestRef op) override;
 
-  void start_epoch() override {
-    for (map<int,HealthService*>::iterator it = services.begin();
-         it != services.end(); ++it) {
-      it->second->start(get_epoch());
-    }
-  }
+  void start_epoch() override;
 
-  void finish_epoch() override {
-    generic_dout(20) << "HealthMonitor::finish_epoch()" << dendl;
-    for (map<int,HealthService*>::iterator it = services.begin();
-         it != services.end(); ++it) {
-      assert(it->second != NULL);
-      it->second->finish();
-    }
-  }
+  void finish_epoch() override;
 
   void cleanup() override { }
   void service_tick() override { }