From 0b59a7f8adc38937807f445b88742e9eb9786c55 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 12 Jun 2017 17:44:57 -0400 Subject: [PATCH] mon: HealthMonitor -> OldHealthMonitor This will go away post-luminous. Signed-off-by: Sage Weil --- src/mon/CMakeLists.txt | 2 +- src/mon/Monitor.cc | 4 ++-- .../{HealthMonitor.cc => OldHealthMonitor.cc} | 21 +++++++++---------- .../{HealthMonitor.h => OldHealthMonitor.h} | 16 +++++++------- 4 files changed, 21 insertions(+), 22 deletions(-) rename src/mon/{HealthMonitor.cc => OldHealthMonitor.cc} (85%) rename src/mon/{HealthMonitor.h => OldHealthMonitor.h} (78%) diff --git a/src/mon/CMakeLists.txt b/src/mon/CMakeLists.txt index 9e40ef58863ca..1ba6802e12063 100644 --- a/src/mon/CMakeLists.txt +++ b/src/mon/CMakeLists.txt @@ -15,7 +15,7 @@ set(lib_mon_srcs LogMonitor.cc AuthMonitor.cc Elector.cc - HealthMonitor.cc + OldHealthMonitor.cc DataHealthService.cc PGMonitor.cc PGMap.cc diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index cad12467ad4eb..acb50bc508125 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -77,7 +77,7 @@ #include "MgrMonitor.h" #include "MgrStatMonitor.h" #include "mon/QuorumService.h" -#include "mon/HealthMonitor.h" +#include "mon/OldHealthMonitor.h" #include "mon/ConfigKeyService.h" #include "common/config.h" #include "common/cmdparse.h" @@ -205,7 +205,7 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s, paxos_service[PAXOS_MGR] = new MgrMonitor(this, paxos, "mgr"); paxos_service[PAXOS_MGRSTAT] = new MgrStatMonitor(this, paxos, "mgrstat"); - health_monitor = new HealthMonitor(this); + health_monitor = new OldHealthMonitor(this); config_key_service = new ConfigKeyService(this, paxos); mon_caps = new MonCap(); diff --git a/src/mon/HealthMonitor.cc b/src/mon/OldHealthMonitor.cc similarity index 85% rename from src/mon/HealthMonitor.cc rename to src/mon/OldHealthMonitor.cc index 2b022b45d8eb1..d7264a7ee26bd 100644 --- a/src/mon/HealthMonitor.cc +++ b/src/mon/OldHealthMonitor.cc @@ -22,7 +22,7 @@ #include "mon/Monitor.h" #include "mon/HealthService.h" -#include "mon/HealthMonitor.h" +#include "mon/OldHealthMonitor.h" #include "mon/DataHealthService.h" #include "messages/MMonHealth.h" @@ -33,13 +33,13 @@ #undef dout_prefix #define dout_prefix _prefix(_dout, mon, this) static ostream& _prefix(std::ostream *_dout, const Monitor *mon, - const HealthMonitor *hmon) { + const OldHealthMonitor *hmon) { return *_dout << "mon." << mon->name << "@" << mon->rank << "(" << mon->get_state_name() << ")." << hmon->get_name() << "(" << hmon->get_epoch() << ") "; } -void HealthMonitor::init() +void OldHealthMonitor::init() { dout(10) << __func__ << dendl; assert(services.empty()); @@ -52,7 +52,7 @@ void HealthMonitor::init() } } -bool HealthMonitor::service_dispatch(MonOpRequestRef op) +bool OldHealthMonitor::service_dispatch(MonOpRequestRef op) { assert(op->get_req()->get_type() == MSG_MON_HEALTH); MMonHealth *hm = static_cast(op->get_req()); @@ -65,7 +65,7 @@ bool HealthMonitor::service_dispatch(MonOpRequestRef op) return services[service_type]->service_dispatch(op); } -void HealthMonitor::start_epoch() { +void OldHealthMonitor::start_epoch() { epoch_t epoch = get_epoch(); for (map::iterator it = services.begin(); it != services.end(); ++it) { @@ -73,8 +73,8 @@ void HealthMonitor::start_epoch() { } } -void HealthMonitor::finish_epoch() { - generic_dout(20) << "HealthMonitor::finish_epoch()" << dendl; +void OldHealthMonitor::finish_epoch() { + generic_dout(20) << "OldHealthMonitor::finish_epoch()" << dendl; for (map::iterator it = services.begin(); it != services.end(); ++it) { assert(it->second != NULL); @@ -82,9 +82,9 @@ void HealthMonitor::finish_epoch() { } } -void HealthMonitor::service_shutdown() +void OldHealthMonitor::service_shutdown() { - dout(0) << "HealthMonitor::service_shutdown " + dout(0) << "OldHealthMonitor::service_shutdown " << services.size() << " services" << dendl; for (map::iterator it = services.begin(); it != services.end(); @@ -95,7 +95,7 @@ void HealthMonitor::service_shutdown() services.clear(); } -void HealthMonitor::get_health( +void OldHealthMonitor::get_health( list >& summary, list > *detail) { @@ -105,4 +105,3 @@ void HealthMonitor::get_health( it->second->get_health(summary, detail); } } - diff --git a/src/mon/HealthMonitor.h b/src/mon/OldHealthMonitor.h similarity index 78% rename from src/mon/HealthMonitor.h rename to src/mon/OldHealthMonitor.h index 66e14d687e265..f295693611b25 100644 --- a/src/mon/HealthMonitor.h +++ b/src/mon/OldHealthMonitor.h @@ -11,8 +11,8 @@ * Foundation. See file COPYING. * */ -#ifndef CEPH_HEALTH_MONITOR_H -#define CEPH_HEALTH_MONITOR_H +#ifndef CEPH_MON_OLDHEALTHMONITOR_H +#define CEPH_MON_OLDHEALTHMONITOR_H #include "mon/QuorumService.h" @@ -20,7 +20,7 @@ namespace ceph { class Formatter; } class HealthService; -class HealthMonitor : public QuorumService +class OldHealthMonitor : public QuorumService { map services; @@ -28,14 +28,14 @@ protected: void service_shutdown() override; public: - HealthMonitor(Monitor *m) : QuorumService(m) { } - ~HealthMonitor() override { + OldHealthMonitor(Monitor *m) : QuorumService(m) { } + ~OldHealthMonitor() override { assert(services.empty()); } /** - * @defgroup HealthMonitor_Inherited_h Inherited abstract methods + * @defgroup OldHealthMonitor_Inherited_h Inherited abstract methods * @{ */ void init() override; @@ -59,8 +59,8 @@ public: } /** - * @} // HealthMonitor_Inherited_h + * @} // OldHealthMonitor_Inherited_h */ }; -#endif // CEPH_HEALTH_MONITOR_H +#endif -- 2.39.5