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

MXS-2169 Allow a downed server to be selected as topology master

Browse Source 
This is required for the case when MaxScale is started when the master is
already down.
This commit is contained in:
Esa Korhonen
2019-05-10 11:23:41 +03:00
parent d2f3e56d0a
commit 4ee30f5c52
6 changed files with 290 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -446,10 +446,10 @@ void MariaDBMonitor::tick()
}
}
// Topology needs to be rechecked if it has changed or if master is down.
if (m_cluster_topology_changed || (m_master && m_master->is_down()))
update_topology();
if (m_cluster_topology_changed)
{
update_topology();
m_cluster_topology_changed = false;
// If cluster operations are enabled, check topology support and disable if needed.
if (m_settings.auto_failover || m_settings.switchover_on_low_disk_space || m_settings.auto_rejoin)
@ -675,7 +675,7 @@ void MariaDBMonitor::assign_new_master(MariaDBServer* new_master)
mxb::atomic::store(&m_master, new_master, mxb::atomic::RELAXED);
update_master_cycle_info();
m_warn_current_master_invalid = true;
m_warn_have_better_master = true;
m_warn_cannot_find_master = true;
}
/**