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

MXS-1775 Fix NDPCMonitor 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:44:55 +03:00
parent ced063b1a0
commit 8fed6752bd
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,15 +133,15 @@ void NDBCMonitor::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;
@ -154,9 +154,9 @@ void NDBCMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
return; return;
} }
server_clear_status_nolock(monitored_server->server, SERVER_AUTH_ERROR); monitor_clear_pending_status(monitored_server, SERVER_AUTH_ERROR);
/* 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);
MYSQL_ROW row; MYSQL_ROW row;
MYSQL_RES *result; MYSQL_RES *result;
@ -227,12 +227,14 @@ void NDBCMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
if (isjoined) if (isjoined)
{ {
server_set_status_nolock(monitored_server->server, SERVER_NDB); monitor_set_pending_status(monitored_server, SERVER_NDB);
monitored_server->server->depth = 0; monitored_server->server->depth = 0;
} }
else else
{ {
server_clear_status_nolock(monitored_server->server, SERVER_NDB); monitor_clear_pending_status(monitored_server, SERVER_NDB);
monitored_server->server->depth = -1; monitored_server->server->depth = -1;
} }
monitored_server->server->status = monitored_server->pending_status;
} }