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

MXS-1775 Set/clear initial bits similarly in all monitors

Browse Source
This commit is contained in:
Johan Wikman
2018-05-24 14:23:51 +03:00
parent 8fed6752bd
commit f50ebfce2a
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,9 +81,10 @@ void AuroraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
return;
}
monitor_clear_pending_status(monitored_server,
SERVER_RUNNING | SERVER_MASTER | SERVER_SLAVE | SERVER_AUTH_ERROR);
monitor_clear_pending_status(monitored_server, SERVER_AUTH_ERROR);
monitor_set_pending_status(monitored_server, SERVER_RUNNING);
monitor_clear_pending_status(monitored_server, SERVER_MASTER | SERVER_SLAVE);
MYSQL_RES *result;
/** Connection is OK, query for replica status */

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

@ -287,13 +287,13 @@ void GaleraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
return;
}
server_clear_status_nolock(monitored_server->server, SERVER_AUTH_ERROR);
server_set_status_nolock(monitored_server->server, SERVER_RUNNING);
MYSQL_ROW row;
MYSQL_RES *result;
char *server_string;
/* If we get this far then we have a working connection */
server_set_status_nolock(monitored_server->server, SERVER_RUNNING);
/* get server version string */
mxs_mysql_set_server_version(monitored_server->con, monitored_server->server);
server_string = monitored_server->server->version_string;

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

@ -152,7 +152,7 @@ void GRMon::update_server_status(MXS_MONITORED_SERVER* monitored_server)
return;
}
/* If we get this far then we have a working connection */
monitor_clear_pending_status(monitored_server, SERVER_AUTH_ERROR);
monitor_set_pending_status(monitored_server, SERVER_RUNNING);
if (is_master(monitored_server))

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

@ -176,6 +176,8 @@ void MMMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
server_clear_status_nolock(monitored_server->server, SERVER_AUTH_ERROR);
monitor_clear_pending_status(monitored_server, SERVER_AUTH_ERROR);
server_set_status_nolock(monitored_server->server, SERVER_RUNNING);
monitor_set_pending_status(monitored_server, SERVER_RUNNING);
MYSQL_ROW row;
MYSQL_RES *result;
@ -184,9 +186,6 @@ void MMMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
unsigned long int server_version = 0;
char *server_string;
/* Store current status in both server and monitor server pending struct */
server_set_status_nolock(monitored_server->server, SERVER_RUNNING);
monitor_set_pending_status(monitored_server, SERVER_RUNNING);
/* get server version from current server */
server_version = mysql_get_server_version(monitored_server->con);

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

@ -155,7 +155,6 @@ void NDBCMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
}
monitor_clear_pending_status(monitored_server, SERVER_AUTH_ERROR);
/* If we get this far then we have a working connection */
monitor_set_pending_status(monitored_server, SERVER_RUNNING);
MYSQL_ROW row;