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_master_gtid_domain(-1)
, m_external_master_port(PORT_UNKNOWN) , m_external_master_port(PORT_UNKNOWN)
, m_warn_set_standalone_master(true) , m_warn_set_standalone_master(true)
, m_checked(false)
{} {}
MariaDBMonitor::~MariaDBMonitor() MariaDBMonitor::~MariaDBMonitor()
@ -149,16 +148,9 @@ bool MariaDBMonitor::start(const MXS_CONFIG_PARAMETER* params)
error = true; 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;
{
error = true;
}
else
{
m_checked = true;
}
} }
if (!error) if (!error)

1
server/modules/monitor/mariadbmon/mariadbmon.hh
View File

@ -163,7 +163,6 @@ private:
std::string m_script; /**< Script to call when state changes occur on servers */ std::string m_script; /**< Script to call when state changes occur on servers */
uint64_t m_events; /**< enabled events */ uint64_t m_events; /**< enabled events */
bool m_warn_set_standalone_master; /**< Log a warning when setting standalone master */ bool m_warn_set_standalone_master; /**< Log a warning when setting standalone master */
bool m_checked; /**< Whether access to servers has been checked */
enum slave_down_setting_t enum slave_down_setting_t
{ {