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

MXS-1775 m_master is now a member variable of MonitorInstance

Browse Source
This commit is contained in:
Johan Wikman
2018-05-17 13:56:03 +03:00
parent 5aa30e8613
commit db30ea96f2
10 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/maxscale/monitor.hh
View File

@ -40,11 +40,12 @@ protected:
static void main(void* pArg); static void main(void* pArg);
MXS_MONITOR* m_monitor; /**< The generic monitor structure. */ MXS_MONITOR* m_monitor; /**< The generic monitor structure. */
int32_t m_shutdown; /**< Non-zero if the monitor should shut down. */ int32_t m_shutdown; /**< Non-zero if the monitor should shut down. */
std::string m_script; /**< Launchable script. */ std::string m_script; /**< Launchable script. */
uint64_t m_events; /**< Enabled monitor events. */ uint64_t m_events; /**< Enabled monitor events. */
bool m_checked; /**< Whether server access has been checked. */ bool m_checked; /**< Whether server access has been checked. */
MXS_MONITORED_SERVER* m_master; /**< Master server */
private: private:
int32_t m_status; /**< The current status of the monitor. */ int32_t m_status; /**< The current status of the monitor. */

2
server/core/monitor.cc
View File

@ -2510,6 +2510,7 @@ MonitorInstance::MonitorInstance(MXS_MONITOR* pMonitor)
: m_monitor(pMonitor) : m_monitor(pMonitor)
, m_shutdown(0) , m_shutdown(0)
, m_events(0) , m_events(0)
, m_master(NULL)
, m_status(MXS_MONITOR_STOPPED) , m_status(MXS_MONITOR_STOPPED)
, m_thread(0) , m_thread(0)
{ {
@ -2557,6 +2558,7 @@ bool MonitorInstance::start(const MXS_CONFIG_PARAMETER* pParams)
{ {
m_script = config_get_string(pParams, "script"); m_script = config_get_string(pParams, "script");
m_events = config_get_enum(pParams, "events", mxs_monitor_event_enum_values); m_events = config_get_enum(pParams, "events", mxs_monitor_event_enum_values);
m_master = NULL;
configure(pParams); configure(pParams);

1
server/modules/monitor/galeramon/galeramon.cc
View File

@ -105,7 +105,6 @@ GaleraMonitor::GaleraMonitor(MXS_MONITOR *mon)
, m_disableMasterFailback(0) , m_disableMasterFailback(0)
, m_availableWhenDonor(0) , m_availableWhenDonor(0)
, m_disableMasterRoleSetting(0) , m_disableMasterRoleSetting(0)
, m_master(NULL)
, m_root_node_as_master(false) , m_root_node_as_master(false)
, m_use_priority(false) , m_use_priority(false)
, m_set_donor_nodes(false) , m_set_donor_nodes(false)

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

@ -68,7 +68,6 @@ private:
int m_disableMasterFailback; /**< Monitor flag for Galera Cluster Master failback */ int m_disableMasterFailback; /**< Monitor flag for Galera Cluster Master failback */
int m_availableWhenDonor; /**< Monitor flag for Galera Cluster Donor availability */ int m_availableWhenDonor; /**< Monitor flag for Galera Cluster Donor availability */
bool m_disableMasterRoleSetting; /**< Monitor flag to disable setting master role */ bool m_disableMasterRoleSetting; /**< Monitor flag to disable setting master role */
MXS_MONITORED_SERVER *m_master; /**< Master server for MySQL Master/Slave replication */
bool m_root_node_as_master; /**< Whether we require that the Master should bool m_root_node_as_master; /**< Whether we require that the Master should
* have a wsrep_local_index of 0 */ * have a wsrep_local_index of 0 */
bool m_use_priority; /**< Use server priorities */ bool m_use_priority; /**< Use server priorities */

2
server/modules/monitor/grmon/grmon.cc
View File

@ -28,7 +28,6 @@
GRMon::GRMon(MXS_MONITOR* monitor) GRMon::GRMon(MXS_MONITOR* monitor)
: MonitorInstance(monitor) : MonitorInstance(monitor)
, m_master(NULL)
{ {
} }
@ -53,7 +52,6 @@ bool GRMon::has_sufficient_permissions() const
void GRMon::configure(const MXS_CONFIG_PARAMETER* params) void GRMon::configure(const MXS_CONFIG_PARAMETER* params)
{ {
m_master = NULL;
} }
void GRMon::diagnostics(DCB* dcb) const void GRMon::diagnostics(DCB* dcb) const

2
server/modules/monitor/grmon/grmon.hh
View File

@ -32,8 +32,6 @@ public:
json_t* diagnostics_json() const; json_t* diagnostics_json() const;
private: private:
MXS_MONITORED_SERVER* m_master; /**< The master server */
GRMon(MXS_MONITOR* monitor); GRMon(MXS_MONITOR* monitor);
~GRMon(); ~GRMon();

1
server/modules/monitor/mmmon/mmmon.cc
View File

@ -88,7 +88,6 @@ MMMonitor::MMMonitor(MXS_MONITOR *monitor)
: maxscale::MonitorInstance(monitor) : maxscale::MonitorInstance(monitor)
, m_id(MXS_MONITOR_DEFAULT_ID) , m_id(MXS_MONITOR_DEFAULT_ID)
, m_detectStaleMaster(false) , m_detectStaleMaster(false)
, m_master(NULL)
{ {
} }

5
server/modules/monitor/mmmon/mmmon.hh
View File

@ -32,9 +32,8 @@ public:
json_t* diagnostics_json() const; json_t* diagnostics_json() const;
private: private:
unsigned long m_id; /**< Monitor ID */ unsigned long m_id; /**< Monitor ID */
int m_detectStaleMaster; /**< Monitor flag for Stale Master detection */ int m_detectStaleMaster; /**< Monitor flag for Stale Master detection */
MXS_MONITORED_SERVER *m_master; /**< Master server for Master/Slave replication */
MMMonitor(MXS_MONITOR* monitor); MMMonitor(MXS_MONITOR* monitor);
~MMMonitor(); ~MMMonitor();

1
server/modules/monitor/ndbclustermon/ndbclustermon.cc
View File

@ -73,7 +73,6 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
NDBCMonitor::NDBCMonitor(MXS_MONITOR *monitor) NDBCMonitor::NDBCMonitor(MXS_MONITOR *monitor)
: maxscale::MonitorInstance(monitor) : maxscale::MonitorInstance(monitor)
, m_id(MXS_MONITOR_DEFAULT_ID) , m_id(MXS_MONITOR_DEFAULT_ID)
, m_master(NULL)
{ {
} }

3
server/modules/monitor/ndbclustermon/ndbclustermon.hh
View File

@ -32,8 +32,7 @@ public:
json_t* diagnostics_json() const; json_t* diagnostics_json() const;
private: private:
unsigned long m_id; /**< Monitor ID */ unsigned long m_id; /**< Monitor ID */
MXS_MONITORED_SERVER *m_master; /**< Master server for MySQL Master/Slave replication */
NDBCMonitor(MXS_MONITOR* monitor); NDBCMonitor(MXS_MONITOR* monitor);
~NDBCMonitor(); ~NDBCMonitor();