hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1775 Add MonitorInstanceSimple class

Browse Source 
MonitorInstanceSimple is intended for simple monitors that
probe servers in a straightforward fashion. More complex monitors
can be derived directly from MonitorInstance.
This commit is contained in:
Johan Wikman
2018-06-07 11:25:44 +03:00
parent 880db1353a
commit 8afa8c2c5a
14 changed files with 82 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -332,13 +332,6 @@ void MariaDBMonitor::update_server(MariaDBServer& server)
mon_srv->mon_err_count = (is_running || in_maintenance) ? 0 : mon_srv->mon_err_count + 1;
}
void MariaDBMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
{
// Not used and should not be called. Is there a way to check this "statically" (without
// template magic)?
ss_dassert(!true);
}
void MariaDBMonitor::pre_loop()
{
// MonitorInstance loaded from the journal the current master into its

1
server/modules/monitor/mariadbmon/mariadbmon.hh
View File

@ -163,7 +163,6 @@ private:
MariaDBServer* get_server_info(MXS_MONITORED_SERVER* db);
MariaDBServer* get_server(int64_t id);
void update_server(MariaDBServer& server);
void update_server_status(MXS_MONITORED_SERVER* pMonitored_server); // Not used
// Cluster discovery and status assignment methods
MariaDBServer* find_root_master();