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

Remove MonitorManager calls from Monitor functions

Browse Source 
Also adds admin thread checks to MonitorManager functions and combines
anonymous namespaces.
This commit is contained in:
Esa Korhonen
2019-04-26 12:18:26 +03:00
parent c4b27cdefc
commit 82b4338eca
15 changed files with 138 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/core/internal/monitor.hh
View File

@ -17,9 +17,6 @@
*/
#include <maxscale/monitor.hh>
#include <maxscale/resultset.hh>
#include "externcmd.hh"
#include "monitormanager.hh"
#define MON_ARG_MAX 8192
@ -49,28 +46,3 @@ static const MXS_ENUM_VALUE mxs_monitor_event_enum_values[] =
{"new_donor", NEW_DONOR_EVENT},
{NULL}
};
// RAII helper class for temprarily stopping monitors
class MonitorStop
{
public:
MonitorStop(mxs::Monitor* monitor)
: m_monitor(monitor->state() == MONITOR_STATE_RUNNING ? monitor : nullptr)
{
if (m_monitor)
{
MonitorManager::stop_monitor(m_monitor);
}
}
~MonitorStop()
{
if (m_monitor)
{
MonitorManager::start_monitor(m_monitor);
}
}
private:
mxs::Monitor* m_monitor;
};

32
server/core/internal/monitormanager.hh
View File

@ -14,6 +14,8 @@
#include <maxscale/monitor.hh>
class ResultSet;
/**
* This class contains internal monitor management functions that should not be exposed in the public
* monitor class. It's a friend of MXS_MONITOR.
@ -65,7 +67,10 @@ public:
static mxs::Monitor* find_monitor(const char* name);
/**
* @brief Populate services with the servers of the monitors.
* Populate services with the servers of the monitors. Should be called at the end of configuration file
* processing to ensure that services are notified of the servers a monitor has. During runtime, the
* normal add/remove server functions do the notifying. TODO: If a service is created at runtime, is
* it properly populated?
*/
static void populate_services();
@ -139,3 +144,28 @@ public:
*/
static void debug_wait_one_tick();
};
// RAII helper class for temprarily stopping monitors
class MonitorStop
{
public:
MonitorStop(mxs::Monitor* monitor)
: m_monitor(monitor->state() == MONITOR_STATE_RUNNING ? monitor : nullptr)
{
if (m_monitor)
{
MonitorManager::stop_monitor(m_monitor);
}
}
~MonitorStop()
{
if (m_monitor)
{
MonitorManager::start_monitor(m_monitor);
}
}
private:
mxs::Monitor* m_monitor;
};