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

Fix low disk space maintenance

Browse Source 
The setting didn't work because the code updated a status flag which
would be overwritten before being read. Also, promotion code now checks
that the server is not in maintenance.
This commit is contained in:
Esa Korhonen
2018-10-12 15:50:23 +03:00
parent 0c203fa02d
commit 2d61b78439
4 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,6 +460,13 @@ void MariaDBMonitor::tick()
update_external_master();
}
/* Set low disk space slaves to maintenance. This needs to happen after roles have been assigned.
* Is not a real cluster operation, since nothing on the actual backends is changed. */
if (m_maintenance_on_low_disk_space)
{
set_low_disk_slaves_maintenance();
}
// Sanity check. Master may not be both slave and master.
mxb_assert(m_master == NULL || !m_master->has_status(SERVER_SLAVE | SERVER_MASTER));
@ -532,13 +539,6 @@ void MariaDBMonitor::process_state_changes()
enforce_read_only_on_slaves();
}
/* Set low disk space slaves to maintenance.
*/
if (m_maintenance_on_low_disk_space && !m_cluster_modified)
{
set_low_disk_slaves_maintenance();
}
/* Check if the master server is on low disk space and act on it. */
if (m_switchover_on_low_disk_space && !m_cluster_modified)
{