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

MXS-1775 Fix GRMon to update pending_status

Browse Source 
Instead of continuously updating the status of the server object,
the monitor should update the pending_status of the monitor object
and then only at the end update the status of the server object.
This commit is contained in:
Johan Wikman
2018-05-24 12:35:57 +03:00
parent 4b01656bef
commit ced063b1a0
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,15 +131,15 @@ void GRMon::update_server_status(MXS_MONITORED_SERVER* monitored_server)
if (!mon_connection_is_ok(rval)) if (!mon_connection_is_ok(rval))
{ {
server_clear_status_nolock(monitored_server->server, SERVER_RUNNING); monitor_clear_pending_status(monitored_server, SERVER_RUNNING);
if (mysql_errno(monitored_server->con) == ER_ACCESS_DENIED_ERROR) if (mysql_errno(monitored_server->con) == ER_ACCESS_DENIED_ERROR)
{ {
server_set_status_nolock(monitored_server->server, SERVER_AUTH_ERROR); monitor_set_pending_status(monitored_server, SERVER_AUTH_ERROR);
} }
else else
{ {
server_clear_status_nolock(monitored_server->server, SERVER_AUTH_ERROR); monitor_clear_pending_status(monitored_server, SERVER_AUTH_ERROR);
} }
monitored_server->server->node_id = -1; monitored_server->server->node_id = -1;
@ -153,23 +153,25 @@ void GRMon::update_server_status(MXS_MONITORED_SERVER* monitored_server)
} }
/* If we get this far then we have a working connection */ /* If we get this far then we have a working connection */
server_set_status_nolock(monitored_server->server, SERVER_RUNNING); monitor_set_pending_status(monitored_server, SERVER_RUNNING);
if (is_master(monitored_server)) if (is_master(monitored_server))
{ {
server_set_status_nolock(monitored_server->server, SERVER_MASTER); monitor_set_pending_status(monitored_server, SERVER_MASTER);
server_clear_status_nolock(monitored_server->server, SERVER_SLAVE); monitor_clear_pending_status(monitored_server, SERVER_SLAVE);
} }
else if (is_slave(monitored_server)) else if (is_slave(monitored_server))
{ {
server_set_status_nolock(monitored_server->server, SERVER_SLAVE); monitor_set_pending_status(monitored_server, SERVER_SLAVE);
server_clear_status_nolock(monitored_server->server, SERVER_MASTER); monitor_clear_pending_status(monitored_server, SERVER_MASTER);
} }
else else
{ {
server_clear_status_nolock(monitored_server->server, SERVER_SLAVE); monitor_clear_pending_status(monitored_server, SERVER_SLAVE);
server_clear_status_nolock(monitored_server->server, SERVER_MASTER); monitor_clear_pending_status(monitored_server, SERVER_MASTER);
} }
monitored_server->server->status = monitored_server->pending_status;
} }
/** /**