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

MXS-1703: Stop monitor before reading class data

Browse Source 
In theory, the value of m_master could change between reading it to
local variable and stopping monitor. To be on the safe side, stop the
monitor first.
This commit is contained in:
Esa Korhonen
2018-03-20 15:46:06 +02:00
parent 09a22b26c8
commit 5112cb4cfc
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/modules/monitor/mariadbmon/cluster_manipulation.cc
View File

@ -22,22 +22,6 @@ bool MariaDBMonitor::manual_switchover(MXS_MONITORED_SERVER* new_master,
MXS_MONITORED_SERVER* given_current_master, MXS_MONITORED_SERVER* given_current_master,
json_t** error_out) json_t** error_out)
{ {
// Autoselect current master if not given as parameter.
MXS_MONITORED_SERVER* current_master = given_current_master;
if (given_current_master == NULL)
{
if (m_master)
{
current_master = m_master;
}
else
{
const char NO_MASTER[] = "Monitor '%s' has no master server.";
PRINT_MXS_JSON_ERROR(error_out, NO_MASTER, m_monitor_base->name);
return false;
}
}
bool stopped = stop(); bool stopped = stop();
if (stopped) if (stopped)
{ {
@ -48,7 +32,22 @@ bool MariaDBMonitor::manual_switchover(MXS_MONITORED_SERVER* new_master,
MXS_NOTICE("Monitor %s already stopped, switchover can proceed.", m_monitor_base->name); MXS_NOTICE("Monitor %s already stopped, switchover can proceed.", m_monitor_base->name);
} }
bool current_ok = switchover_check_current(current_master, error_out); // Autoselect current master if not given as parameter.
MXS_MONITORED_SERVER* current_master = given_current_master;
if (current_master == NULL)
{
if (m_master)
{
current_master = m_master;
}
else
{
const char NO_MASTER[] = "Monitor '%s' has no master server.";
PRINT_MXS_JSON_ERROR(error_out, NO_MASTER, m_monitor_base->name);
}
}
bool current_ok = (current_master != NULL) ? switchover_check_current(current_master, error_out) : false;
bool new_ok = switchover_check_new(new_master, error_out); bool new_ok = switchover_check_new(new_master, error_out);
// Check that all slaves are using gtid-replication // Check that all slaves are using gtid-replication
bool gtid_ok = true; bool gtid_ok = true;