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

get_replication_tree checks for SERVER_IS_DOWN

Browse Source 
get_replication_tree checks for SERVER_IS_DOWN, this will produce a
replication tree even with servers in SERVER_IN_MAINT state
This commit is contained in:
MassimilianoPinto
2014-06-27 17:16:38 +02:00
parent a25b757134
commit 3a299a9ed8
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/monitor/mysql_mon.c
View File

@ -947,7 +947,8 @@ static void set_slave_heartbeat(MYSQL_MONITOR *handle, MONITOR_SERVERS *database
/******* /*******
* This function computes the replication tree * This function computes the replication tree
* from a set of MySQL Master/Slave monitored servers * from a set of MySQL Master/Slave monitored servers
* and returns the root server with SERVER_MASTER bit * and returns the root server with SERVER_MASTER bit.
* The tree is computed even for servers in 'maintenance' mode.
* *
* @param handle The monitor handle * @param handle The monitor handle
* @param num_servers The number of servers monitored * @param num_servers The number of servers monitored
@ -967,9 +968,12 @@ static MONITOR_SERVERS *get_replication_tree(MYSQL_MONITOR *handle, int num_serv
while (ptr) while (ptr)
{ {
if (SERVER_IN_MAINT(ptr->server) || SERVER_IS_DOWN(ptr->server)) { /* The server could be in SERVER_IN_MAINT
* that means SERVER_IS_RUNNING returns 0
* Let's check only for SERVER_IS_DOWN: server is not running
*/
if (SERVER_IS_DOWN(ptr->server)) {
ptr = ptr->next; ptr = ptr->next;
continue; continue;
} }
depth = 0; depth = 0;
@ -1032,6 +1036,11 @@ static MONITOR_SERVERS *get_replication_tree(MYSQL_MONITOR *handle, int num_serv
ptr = ptr->next; ptr = ptr->next;
} }
/* If root master is in MAINT, return NULL */
if (SERVER_IN_MAINT(handle->master->server)) {
return NULL;
}
return handle->master; return handle->master;
} }