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

MXS-1775 Turn NDBC monitor into a class.

Browse Source 
A mechanical change, without any functional modifications.
This commit is contained in:
Johan Wikman
2018-05-15 19:49:25 +03:00
parent 4b236a79db
commit 90f1784d21
2 changed files with 95 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,28 +21,8 @@
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/mysql_utils.h> #include <maxscale/mysql_utils.h>
static void monitorMain(void *);
/* @see function load_module in load_utils.c for explanation of the following
* lint directives.
*/
/*lint -e14 */
/*lint +e14 */
static MXS_MONITOR_INSTANCE *createInstance(MXS_MONITOR *);
static void destroyInstance(MXS_MONITOR_INSTANCE*);
static bool startMonitor(MXS_MONITOR_INSTANCE *, const MXS_CONFIG_PARAMETER *params);
static void stopMonitor(MXS_MONITOR_INSTANCE *);
static void diagnostics(const MXS_MONITOR_INSTANCE *, DCB *);
static json_t* diagnostics_json(const MXS_MONITOR_INSTANCE *);
bool isNdbEvent(mxs_monitor_event_t event); bool isNdbEvent(mxs_monitor_event_t event);
extern "C"
{
/** /**
* The module entry point routine. It is this routine that * The module entry point routine. It is this routine that
* must populate the structure that is referred to as the * must populate the structure that is referred to as the
@ -51,20 +31,10 @@ extern "C"
* *
* @return The module object * @return The module object
*/ */
MXS_MODULE* MXS_CREATE_MODULE() extern "C" MXS_MODULE* MXS_CREATE_MODULE()
{ {
MXS_NOTICE("Initialise the MySQL Cluster Monitor module."); MXS_NOTICE("Initialise the MySQL Cluster Monitor module.");
static MXS_MONITOR_API MyObject =
{
createInstance,
destroyInstance,
startMonitor,
stopMonitor,
diagnostics,
diagnostics_json
};
static MXS_MODULE info = static MXS_MODULE info =
{ {
MXS_MODULE_API_MONITOR, MXS_MODULE_API_MONITOR,
@ -73,7 +43,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
"A MySQL cluster SQL node monitor", "A MySQL cluster SQL node monitor",
"V2.1.0", "V2.1.0",
MXS_NO_MODULE_CAPABILITIES, MXS_NO_MODULE_CAPABILITIES,
&MyObject, &maxscale::MonitorApi<NDBCMonitor>::s_api,
NULL, /* Process init. */ NULL, /* Process init. */
NULL, /* Process finish. */ NULL, /* Process finish. */
NULL, /* Thread init. */ NULL, /* Thread init. */
@ -99,35 +69,35 @@ MXS_MODULE* MXS_CREATE_MODULE()
return &info; return &info;
} }
}
/*lint +e14 */
static MXS_MONITOR_INSTANCE* createInstance(MXS_MONITOR *mon) NDBCMonitor::NDBCMonitor(MXS_MONITOR *monitor)
: m_thread(0)
, m_id(MXS_MONITOR_DEFAULT_ID)
, m_events(0)
, m_shutdown(0)
, m_status(0)
, m_master(NULL)
, m_script(NULL)
, m_monitor(NULL)
, m_checked(false)
{ {
NDBC_MONITOR* handle = static_cast<NDBC_MONITOR*>(MXS_CALLOC(1, sizeof(NDBC_MONITOR)));
if (handle)
{
handle->shutdown = 0;
handle->id = MXS_MONITOR_DEFAULT_ID;
handle->master = NULL;
handle->monitor = mon;
handle->script = NULL;
handle->events = 0;
handle->checked = false;
}
return handle;
} }
void destroyInstance(MXS_MONITOR_INSTANCE* mon) NDBCMonitor::~NDBCMonitor()
{ {
NDBC_MONITOR* handle = static_cast<NDBC_MONITOR*>(mon); ss_dassert(!m_thread);
ss_dassert(!handle->thread); ss_dassert(!m_script);
ss_dassert(!handle->script); }
MXS_FREE(handle); // static
NDBCMonitor* NDBCMonitor::create(MXS_MONITOR* monitor)
{
return new NDBCMonitor(monitor);
}
void NDBCMonitor::destroy()
{
delete this;
} }
/** /**
@ -137,34 +107,32 @@ void destroyInstance(MXS_MONITOR_INSTANCE* mon)
* *
* @return A handle to use when interacting with the monitor * @return A handle to use when interacting with the monitor
*/ */
static bool startMonitor(MXS_MONITOR_INSTANCE *mon, const MXS_CONFIG_PARAMETER *params) bool NDBCMonitor::start(const MXS_CONFIG_PARAMETER *params)
{ {
bool started = false; bool started = false;
NDBC_MONITOR *handle = static_cast<NDBC_MONITOR*>(mon); if (!m_checked)
if (!handle->checked)
{ {
if (!check_monitor_permissions(handle->monitor, "SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'")) if (!check_monitor_permissions(m_monitor, "SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'"))
{ {
MXS_ERROR("Failed to start monitor. See earlier errors for more information."); MXS_ERROR("Failed to start monitor. See earlier errors for more information.");
} }
else else
{ {
handle->checked = true; m_checked = true;
} }
} }
if (handle->checked) if (m_checked)
{ {
handle->script = config_copy_string(params, "script"); m_script = config_copy_string(params, "script");
handle->events = config_get_enum(params, "events", mxs_monitor_event_enum_values); m_events = config_get_enum(params, "events", mxs_monitor_event_enum_values);
if (thread_start(&handle->thread, monitorMain, handle, 0) == NULL) if (thread_start(&m_thread, &NDBCMonitor::main, this, 0) == NULL)
{ {
MXS_ERROR("Failed to start monitor thread for monitor '%s'.", handle->monitor->name); MXS_ERROR("Failed to start monitor thread for monitor '%s'.", m_monitor->name);
MXS_FREE(handle->script); MXS_FREE(m_script);
handle->script = NULL; m_script = NULL;
} }
else else
{ {
@ -180,19 +148,17 @@ static bool startMonitor(MXS_MONITOR_INSTANCE *mon, const MXS_CONFIG_PARAMETER *
* *
* @param arg Handle on thr running monior * @param arg Handle on thr running monior
*/ */
static void void NDBCMonitor::stop()
stopMonitor(MXS_MONITOR_INSTANCE *mon)
{ {
NDBC_MONITOR *handle = static_cast<NDBC_MONITOR*>(mon); ss_dassert(m_thread);
ss_dassert(handle->thread);
handle->shutdown = 1; m_shutdown = 1;
thread_wait(handle->thread); thread_wait(m_thread);
handle->thread = 0; m_thread = 0;
handle->shutdown = 0; m_shutdown = 0;
MXS_FREE(handle->script); MXS_FREE(m_script);
handle->script = NULL; m_script = NULL;
} }
/** /**
@ -338,11 +304,14 @@ monitorDatabase(MXS_MONITORED_SERVER *database, char *defaultUser, char *default
* *
* @param arg The handle of the monitor * @param arg The handle of the monitor
*/ */
static void //static
monitorMain(void *arg) void NDBCMonitor::main(void* arg)
{
static_cast<NDBCMonitor*>(arg)->main();
}
void NDBCMonitor::main()
{ {
NDBC_MONITOR *handle = (NDBC_MONITOR*)arg;
MXS_MONITOR* mon = handle->monitor;
MXS_MONITORED_SERVER *ptr; MXS_MONITORED_SERVER *ptr;
size_t nrounds = 0; size_t nrounds = 0;
@ -352,16 +321,16 @@ monitorMain(void *arg)
return; return;
} }
handle->status = MXS_MONITOR_RUNNING; m_status = MXS_MONITOR_RUNNING;
load_server_journal(mon, NULL); load_server_journal(m_monitor, NULL);
while (1) while (1)
{ {
if (handle->shutdown) if (m_shutdown)
{ {
handle->status = MXS_MONITOR_STOPPING; m_status = MXS_MONITOR_STOPPING;
mysql_thread_end(); mysql_thread_end();
handle->status = MXS_MONITOR_STOPPED; m_status = MXS_MONITOR_STOPPED;
return; return;
} }
@ -374,7 +343,7 @@ monitorMain(void *arg)
* round. * round.
*/ */
if (nrounds != 0 && if (nrounds != 0 &&
((nrounds * MXS_MON_BASE_INTERVAL_MS) % mon->interval) >= ((nrounds * MXS_MON_BASE_INTERVAL_MS) % m_monitor->interval) >=
MXS_MON_BASE_INTERVAL_MS) MXS_MON_BASE_INTERVAL_MS)
{ {
nrounds += 1; nrounds += 1;
@ -382,14 +351,14 @@ monitorMain(void *arg)
} }
nrounds += 1; nrounds += 1;
lock_monitor_servers(mon); lock_monitor_servers(m_monitor);
servers_status_pending_to_current(mon); servers_status_pending_to_current(m_monitor);
ptr = mon->monitored_servers; ptr = m_monitor->monitored_servers;
while (ptr) while (ptr)
{ {
ptr->mon_prev_status = ptr->server->status; ptr->mon_prev_status = ptr->server->status;
monitorDatabase(ptr, mon->user, mon->password, mon); monitorDatabase(ptr, m_monitor->user, m_monitor->password, m_monitor);
if (ptr->server->status != ptr->mon_prev_status || if (ptr->server->status != ptr->mon_prev_status ||
SERVER_IS_DOWN(ptr->server)) SERVER_IS_DOWN(ptr->server))
@ -407,11 +376,11 @@ monitorMain(void *arg)
* After updating the status of all servers, check if monitor events * After updating the status of all servers, check if monitor events
* need to be launched. * need to be launched.
*/ */
mon_process_state_changes(mon, handle->script, handle->events); mon_process_state_changes(m_monitor, m_script, m_events);
mon_hangup_failed_servers(mon); mon_hangup_failed_servers(m_monitor);
servers_status_current_to_pending(mon); servers_status_current_to_pending(m_monitor);
store_server_journal(mon, NULL); store_server_journal(m_monitor, NULL);
release_monitor_servers(mon); release_monitor_servers(m_monitor);
} }
} }

41
server/modules/monitor/ndbclustermon/ndbclustermon.h
View File

@ -13,21 +13,38 @@
* Public License. * Public License.
*/ */
#include <maxscale/monitor.h> #include <maxscale/monitor.hh>
#include <maxscale/spinlock.h> #include <maxscale/spinlock.h>
#include <maxscale/thread.h> #include <maxscale/thread.h>
// The handle for an instance of a NDB Cluster Monitor module // The handle for an instance of a NDB Cluster Monitor module
struct NDBC_MONITOR : public MXS_MONITOR_INSTANCE class NDBCMonitor : public MXS_MONITOR_INSTANCE
{ {
THREAD thread; /**< Monitor thread */ public:
SPINLOCK lock; /**< The monitor spinlock */ NDBCMonitor(const NDBCMonitor&) = delete;
unsigned long id; /**< Monitor ID */ NDBCMonitor& operator = (const NDBCMonitor&) = delete;
uint64_t events; /**< enabled events */
int shutdown; /**< Flag to shutdown the monitor thread */ static NDBCMonitor* create(MXS_MONITOR* monitor);
int status; /**< Monitor status */ void destroy();
MXS_MONITORED_SERVER *master; /**< Master server for MySQL Master/Slave replication */ bool start(const MXS_CONFIG_PARAMETER* param);
char* script; /**< Script to call when state changes occur on servers */ void stop();
MXS_MONITOR* monitor; /**< Pointer to generic monitor structure */ void diagnostics(DCB* dcb) const;
bool checked; /**< Whether server access has been checked */ json_t* diagnostics_json() const;
private:
THREAD m_thread; /**< Monitor thread */
unsigned long m_id; /**< Monitor ID */
uint64_t m_events; /**< enabled events */
int m_shutdown; /**< Flag to shutdown the monitor thread */
int m_status; /**< Monitor status */
MXS_MONITORED_SERVER *m_master; /**< Master server for MySQL Master/Slave replication */
char* m_script; /**< Script to call when state changes occur on servers */
MXS_MONITOR* m_monitor; /**< Pointer to generic monitor structure */
bool m_checked; /**< Whether server access has been checked */
NDBCMonitor(MXS_MONITOR* monitor);
~NDBCMonitor();
void main();
static void main(void* data);
}; };