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

Always check monitor permissions when starting monitor

Browse Source 
Servers could have been added while monitor was down so better be on the safe side.
This commit is contained in:
Esa Korhonen
2018-05-08 16:14:27 +03:00
parent 42c10cfa1c
commit 0b459c0496
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,6 @@ MariaDBMonitor::MariaDBMonitor(MXS_MONITOR* monitor_base)
, m_master_gtid_domain(-1)
, m_external_master_port(PORT_UNKNOWN)
, m_warn_set_standalone_master(true)
, m_checked(false)
{}
MariaDBMonitor::~MariaDBMonitor()
@ -149,16 +148,9 @@ bool MariaDBMonitor::start(const MXS_CONFIG_PARAMETER* params)
error = true;
}
if (!error && !m_checked)
if (!error && !check_monitor_permissions(m_monitor_base, "SHOW SLAVE STATUS"))
{
if (!check_monitor_permissions(m_monitor_base, "SHOW SLAVE STATUS"))
{
error = true;
}
else
{
m_checked = true;
}
error = true;
}
if (!error)