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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Esa Korhonen
2019-09-06 10:59:08 +03:00
parent 29dd16b333 ff2048625b
commit ebbd806c6a
5 changed files with 83 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/monitor.cc
View File

@ -2105,18 +2105,12 @@ void MonitorWorkerSimple::tick()
* the server state bits. This would allow clearing the state by
* zeroing it out.
*/
const uint64_t bits_to_clear = ~SERVER_WAS_MASTER;
pMs->clear_pending_status(bits_to_clear);
pMs->clear_pending_status(MonitorServer::SERVER_DOWN_CLEAR_BITS);
if (mysql_errno(pMs->con) == ER_ACCESS_DENIED_ERROR)
{
pMs->set_pending_status(SERVER_AUTH_ERROR);
}
else
{
pMs->clear_pending_status(SERVER_AUTH_ERROR);
}
if (pMs->status_changed() && pMs->should_print_fail_status())
{

6
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -2231,9 +2231,9 @@ void MariaDBServer::update_server(bool time_to_update_disk_space,
}
else
{
/* The current server is not running. Clear all but the stale master bit as it is used to detect
* masters that went down but came up. */
server->clear_status(~SERVER_WAS_MASTER);
/* The current server is not running. Clear some of the bits. User-set bits and some long-term bits
* can stay. */
server->clear_status(MonitorServer::SERVER_DOWN_CLEAR_BITS);
auto conn_errno = mysql_errno(conn);
if (conn_errno == ER_ACCESS_DENIED_ERROR || conn_errno == ER_ACCESS_DENIED_NO_PASSWORD_ERROR)
{