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

MXS-1493: Check that master appears dead before verifying it

Browse Source 
Before the verification of the master's failure is done, the master must
first appear to have failed.
This commit is contained in:
Markus Mäkelä
2017-10-27 12:39:57 +03:00
parent 0bc439641a
commit c7c670930c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/monitor/mysqlmon/mysql_mon.cc
View File

@ -1148,6 +1148,12 @@ static bool update_slave_status(MYSQL_MONITOR* handle, MXS_MONITORED_SERVER* db)
return do_show_slave_status(info, db, version); return do_show_slave_status(info, db, version);
} }
static inline bool master_maybe_dead(MYSQL_MONITOR* handle)
{
return handle->verify_master_failure && handle->master &&
SERVER_IS_DOWN(handle->master->server);
}
static bool master_still_alive(MYSQL_MONITOR* handle) static bool master_still_alive(MYSQL_MONITOR* handle)
{ {
bool rval = true; bool rval = true;
@ -2097,7 +2103,7 @@ monitorMain(void *arg)
"'%s' via MaxAdmin or the REST API.", CN_FAILOVER, mon->name); "'%s' via MaxAdmin or the REST API.", CN_FAILOVER, mon->name);
handle->failover = false; handle->failover = false;
} }
else if (handle->verify_master_failure && master_still_alive(handle)) else if (master_maybe_dead(handle) && master_still_alive(handle))
{ {
MXS_INFO("Master failure not yet confirmed by slaves, delaying failover."); MXS_INFO("Master failure not yet confirmed by slaves, delaying failover.");
} }