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

Assign status bits only for running servers

Browse Source 
In previously the status bits were assigned only for running servers. Due
to the changes done in the monitoring algorithm, the slave and master
status bits are assigned to servers that are down. This change broke a
number of tests and deviates from previous behavior.

To keep the old behavior and to fix the test, the status bits are not
assigned to servers that are down.
This commit is contained in:
Markus Mäkelä
2018-07-06 14:21:44 +03:00
parent f1905d33b1
commit 9d94230237
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/monitor/mariadbmon/cluster_discovery.cc
View File

@ -726,7 +726,10 @@ void MariaDBMonitor::assign_master_and_slave()
(m_detect_stale_master && (m_master->m_server_base->pending_status & SERVER_WAS_MASTER)))
{
m_master->clear_status(SLAVE_BITS | SERVER_RELAY_MASTER);
m_master->set_status(MASTER_BITS);
if (m_master->has_status(SERVER_RUNNING))
{
m_master->set_status(MASTER_BITS);
}
}
// Run another DFS, this time assigning slaves.
@ -796,7 +799,10 @@ void MariaDBMonitor::assign_slave_and_relay_master(MariaDBServer* node)
if (slave->m_node.index == NodeData::INDEX_NOT_VISITED)
{
slave->clear_status(MASTER_BITS);
slave->set_status(SLAVE_BITS);
if (slave->has_status(SERVER_RUNNING))
{
slave->set_status(SLAVE_BITS);
}
assign_slave_and_relay_master(slave);
}
}