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

MXS-1775 Fix AuroraMonitor 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 11:19:15 +03:00
parent 8d1b8a1774
commit 4b01656bef
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,15 +60,15 @@ void AuroraMonitor::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;
@ -81,13 +81,9 @@ void AuroraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
return; return;
} }
SERVER temp_server = {}; monitor_clear_pending_status(monitored_server,
temp_server.status = monitored_server->server->status; SERVER_RUNNING | SERVER_MASTER | SERVER_SLAVE | SERVER_AUTH_ERROR);
server_clear_status_nolock(&temp_server, monitor_set_pending_status(monitored_server, SERVER_RUNNING);
SERVER_RUNNING | SERVER_MASTER | SERVER_SLAVE | SERVER_AUTH_ERROR);
server_set_status_nolock(&temp_server, SERVER_RUNNING);
MYSQL_RES *result; MYSQL_RES *result;
/** Connection is OK, query for replica status */ /** Connection is OK, query for replica status */
@ -106,7 +102,7 @@ void AuroraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
status = SERVER_MASTER; status = SERVER_MASTER;
} }
server_set_status_nolock(&temp_server, status); monitor_set_pending_status(monitored_server, status);
mysql_free_result(result); mysql_free_result(result);
} }
else else
@ -114,7 +110,7 @@ void AuroraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
mon_report_query_error(monitored_server); mon_report_query_error(monitored_server);
} }
server_transfer_status(monitored_server->server, &temp_server); monitored_server->server->status = monitored_server->pending_status;
} }
bool AuroraMonitor::has_sufficient_permissions() const bool AuroraMonitor::has_sufficient_permissions() const