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

MXS-1775 Monitoring function named consistently

Browse Source 
The main monitoring function now has the same name in all
monitors (except MariaDBMonitor) and is a member function.
This commit is contained in:
Johan Wikman
2018-05-23 14:29:05 +03:00
parent af9beecaef
commit cb1da5538c
10 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/monitor/auroramon/auroramon.cc
View File

@ -55,7 +55,7 @@ void AuroraMonitor::destroy()
* @param monitor Monitor object
* @param database Server whose status should be updated
*/
void update_server_status(MXS_MONITOR *monitor, MXS_MONITORED_SERVER *database)
void AuroraMonitor::update_server_status(MXS_MONITORED_SERVER *database)
{
if (!SERVER_IN_MAINT(database->server))
{
@ -65,7 +65,7 @@ void update_server_status(MXS_MONITOR *monitor, MXS_MONITORED_SERVER *database)
database->mon_prev_status = database->server->status;
/** Try to connect to or ping the database */
mxs_connect_result_t rval = mon_ping_or_connect_to_db(monitor, database);
mxs_connect_result_t rval = mon_ping_or_connect_to_db(m_monitor, database);
if (mon_connection_is_ok(rval))
{
@ -118,7 +118,7 @@ void AuroraMonitor::tick()
{
for (MXS_MONITORED_SERVER *ptr = m_monitor->monitored_servers; ptr; ptr = ptr->next)
{
update_server_status(m_monitor, ptr);
update_server_status(ptr);
}
}

3
server/modules/monitor/auroramon/auroramon.hh
View File

@ -35,6 +35,9 @@ private:
AuroraMonitor(MXS_MONITOR* monitor);
~AuroraMonitor();
void update_server_status(MXS_MONITORED_SERVER *database);
bool has_sufficient_permissions() const;
void configure(const MXS_CONFIG_PARAMETER* params);
void tick();

4
server/modules/monitor/galeramon/galeramon.cc
View File

@ -261,7 +261,7 @@ static bool using_xtrabackup(MXS_MONITORED_SERVER *database, const char* server_
* @param handle The MySQL Monitor object
* @param database The database to probe
*/
void GaleraMonitor::monitorDatabase(MXS_MONITORED_SERVER *database)
void GaleraMonitor::update_server_status(MXS_MONITORED_SERVER *database)
{
MYSQL_ROW row;
MYSQL_RES *result;
@ -453,7 +453,7 @@ void GaleraMonitor::tick()
{
ptr->mon_prev_status = ptr->server->status;
monitorDatabase(ptr);
update_server_status(ptr);
/* Log server status change */
if (mon_status_changed(ptr))

2
server/modules/monitor/galeramon/galeramon.hh
View File

@ -84,7 +84,7 @@ private:
const char *candidate_uuid,
const int candidate_size);
MXS_MONITORED_SERVER *get_candidate_master();
void monitorDatabase(MXS_MONITORED_SERVER *database);
void update_server_status(MXS_MONITORED_SERVER *database);
void reset_cluster_info();
void set_cluster_members();
void set_galera_cluster();

6
server/modules/monitor/grmon/grmon.cc
View File

@ -125,7 +125,7 @@ static bool is_slave(MXS_MONITORED_SERVER* server)
return rval;
}
static void update_server_status(MXS_MONITOR* monitor, MXS_MONITORED_SERVER* server)
void GRMon::update_server_status(MXS_MONITORED_SERVER* server)
{
/* Don't even probe server flagged as in maintenance */
if (SERVER_IN_MAINT(server->server))
@ -136,7 +136,7 @@ static void update_server_status(MXS_MONITOR* monitor, MXS_MONITORED_SERVER* ser
/** Store previous status */
server->mon_prev_status = server->server->status;
mxs_connect_result_t rval = mon_ping_or_connect_to_db(monitor, server);
mxs_connect_result_t rval = mon_ping_or_connect_to_db(m_monitor, server);
if (!mon_connection_is_ok(rval))
{
@ -185,7 +185,7 @@ void GRMon::tick()
{
for (MXS_MONITORED_SERVER *ptr = m_monitor->monitored_servers; ptr; ptr = ptr->next)
{
update_server_status(m_monitor, ptr);
update_server_status(ptr);
}
}

2
server/modules/monitor/grmon/grmon.hh
View File

@ -35,6 +35,8 @@ private:
GRMon(MXS_MONITOR* monitor);
~GRMon();
void update_server_status(MXS_MONITORED_SERVER* server);
bool has_sufficient_permissions() const;
void configure(const MXS_CONFIG_PARAMETER* params);
void tick();

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

@ -145,8 +145,7 @@ json_t* MMMonitor::diagnostics_json() const
* @param handle The MySQL Monitor object
* @param database The database to probe
*/
static void
monitorDatabase(MXS_MONITOR* mon, MXS_MONITORED_SERVER *database)
void MMMonitor::update_server_status(MXS_MONITORED_SERVER *database)
{
MYSQL_ROW row;
MYSQL_RES *result;
@ -163,7 +162,7 @@ monitorDatabase(MXS_MONITOR* mon, MXS_MONITORED_SERVER *database)
/** Store previous status */
database->mon_prev_status = database->server->status;
mxs_connect_result_t rval = mon_ping_or_connect_to_db(mon, database);
mxs_connect_result_t rval = mon_ping_or_connect_to_db(m_monitor, database);
if (!mon_connection_is_ok(rval))
{
@ -444,7 +443,7 @@ void MMMonitor::tick()
ptr->pending_status = ptr->server->status;
/* monitor current node */
monitorDatabase(m_monitor, ptr);
update_server_status(ptr);
if (mon_status_changed(ptr) ||
mon_print_fail_status(ptr))

2
server/modules/monitor/mmmon/mmmon.hh
View File

@ -40,6 +40,8 @@ private:
MXS_MONITORED_SERVER *get_current_master();
void update_server_status(MXS_MONITORED_SERVER *database);
bool has_sufficient_permissions() const;
void configure(const MXS_CONFIG_PARAMETER* params);
void tick();

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

@ -127,8 +127,7 @@ static json_t* diagnostics_json(const MXS_MONITOR_INSTANCE *mon)
*
* @param database The database to probe
*/
static void
monitorDatabase(MXS_MONITORED_SERVER *database, char *defaultUser, char *defaultPasswd, MXS_MONITOR *mon)
void NDBCMonitor::update_server_status(MXS_MONITORED_SERVER *database)
{
MYSQL_ROW row;
MYSQL_RES *result;
@ -141,7 +140,7 @@ monitorDatabase(MXS_MONITORED_SERVER *database, char *defaultUser, char *default
return;
}
mxs_connect_result_t rval = mon_ping_or_connect_to_db(mon, database);
mxs_connect_result_t rval = mon_ping_or_connect_to_db(m_monitor, database);
if (!mon_connection_is_ok(rval))
{
server_clear_status_nolock(database->server, SERVER_RUNNING);
@ -244,7 +243,7 @@ void NDBCMonitor::tick()
while (ptr)
{
ptr->mon_prev_status = ptr->server->status;
monitorDatabase(ptr, m_monitor->user, m_monitor->password, m_monitor);
update_server_status(ptr);
if (ptr->server->status != ptr->mon_prev_status ||
SERVER_IS_DOWN(ptr->server))

2
server/modules/monitor/ndbclustermon/ndbclustermon.hh
View File

@ -37,6 +37,8 @@ private:
NDBCMonitor(MXS_MONITOR* monitor);
~NDBCMonitor();
void update_server_status(MXS_MONITORED_SERVER *database);
bool has_sufficient_permissions() const;
void configure(const MXS_CONFIG_PARAMETER* params);
void tick();