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

MXS-1775 Thread starting is now handled by MonitorInstance

Browse Source
This commit is contained in:
Johan Wikman
2018-05-16 12:40:50 +03:00
parent adb7f156d6
commit c7eb0a9958
12 changed files with 48 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
server/modules/monitor/auroramon/auroramon.cc
View File

@ -172,54 +172,6 @@ void AuroraMonitor::main()
mysql_thread_end();
}
/**
* @brief Start the monitor
*
* This function initializes the monitor and starts the monitoring thread.
*
* @param arg The MONITOR structure for this monitor
* @param opt The configuration parameters for this monitor
* @return Monitor handle
*/
bool AuroraMonitor::start(const MXS_CONFIG_PARAMETER *params)
{
bool started = false;
ss_dassert(!m_shutdown);
ss_dassert(!m_thread);
ss_dassert(!m_script);
if (!m_checked)
{
if (!has_sufficient_permissions())
{
MXS_ERROR("Failed to start monitor. See earlier errors for more information.");
}
else
{
m_checked = true;
}
}
if (m_checked)
{
configure(params);
if (thread_start(&m_thread, &maxscale::MonitorInstance::main, this, 0) == NULL)
{
MXS_ERROR("Failed to start monitor thread for monitor '%s'.", m_monitor->name);
MXS_FREE(m_script);
m_script = NULL;
}
else
{
started = true;
}
}
return started;
}
bool AuroraMonitor::has_sufficient_permissions() const
{
return check_monitor_permissions(m_monitor, "SELECT @@aurora_server_id, server_id FROM "
@ -229,8 +181,6 @@ bool AuroraMonitor::has_sufficient_permissions() const
void AuroraMonitor::configure(const MXS_CONFIG_PARAMETER* params)
{
m_script = config_copy_string(params, "script");
m_events = config_get_enum(params, "events", mxs_monitor_event_enum_values);
}
/**

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

@ -28,7 +28,6 @@ public:
static AuroraMonitor* create(MXS_MONITOR* monitor);
void destroy();
bool start(const MXS_CONFIG_PARAMETER* param);
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;