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

MXS-1886 Better auto-rejoin error description and tolerance

Browse Source 
Contains changes from commit 09df01752812444c6e7c409a8957d292f7de63cf
adapted to the 2.3 branch.
This commit is contained in:
Esa Korhonen
2018-06-15 17:29:00 +03:00
parent d3e9cc9a4f
commit 019d62bbb8
5 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ MariaDBMonitor::MariaDBMonitor(MXS_MONITOR* monitor)
, m_warn_set_standalone_master(true)
, m_log_no_master(true)
, m_warn_failover_precond(true)
, m_warn_cannot_rejoin(true)
{}
MariaDBMonitor::~MariaDBMonitor()
@ -670,14 +671,6 @@ void MariaDBMonitor::handle_auto_rejoin()
MXS_NOTICE("%d server(s) redirected or rejoined the cluster.", joins);
m_cluster_modified = true;
}
if (joins < joinable_servers.size())
{
MXS_ERROR("A cluster join operation failed, disabling automatic rejoining. "
"To re-enable, manually set '%s' to 'true' for monitor '%s' via MaxAdmin or "
"the REST API.", CN_AUTO_REJOIN, m_monitor->name);
m_auto_rejoin = false;
disable_setting(CN_AUTO_REJOIN);
}
}
else
{