From 0b459c049682a98f5121fc482f73f9feb71ae3cc Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Tue, 8 May 2018 16:14:27 +0300 Subject: [PATCH] Always check monitor permissions when starting monitor Servers could have been added while monitor was down so better be on the safe side. --- server/modules/monitor/mariadbmon/mariadbmon.cc | 12 ++---------- server/modules/monitor/mariadbmon/mariadbmon.hh | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc index 8a57bc84e..bd72ca947 100644 --- a/server/modules/monitor/mariadbmon/mariadbmon.cc +++ b/server/modules/monitor/mariadbmon/mariadbmon.cc @@ -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) diff --git a/server/modules/monitor/mariadbmon/mariadbmon.hh b/server/modules/monitor/mariadbmon/mariadbmon.hh index d4b802b68..5c06ac967 100644 --- a/server/modules/monitor/mariadbmon/mariadbmon.hh +++ b/server/modules/monitor/mariadbmon/mariadbmon.hh @@ -163,7 +163,6 @@ private: std::string m_script; /**< Script to call when state changes occur on servers */ uint64_t m_events; /**< enabled events */ 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 {