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

MXS-2271 Rename monitor-related classes

Browse Source 
MXS_MONITOR->Monitor
MonitorInstance->MonitorWorker
MonitorInstanceSimple->MonitorWorkerSimple
This commit is contained in:
Esa Korhonen
2019-01-21 16:08:23 +02:00
parent 465f9f16c4
commit 9ac8bf93bb
22 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@
* @file auroramon.hh - The Aurora monitor
*/
class AuroraMonitor : public maxscale::MonitorInstanceSimple
class AuroraMonitor : public maxscale::MonitorWorkerSimple
{
public:
AuroraMonitor(const AuroraMonitor&) = delete;

2
server/modules/monitor/clustrixmon/clustrixmonitor.hh
View File

@ -19,7 +19,7 @@
#include "clustrixmembership.hh"
#include "clustrixnode.hh"
class ClustrixMonitor : public maxscale::MonitorInstance
class ClustrixMonitor : public maxscale::MonitorWorker
{
ClustrixMonitor(const ClustrixMonitor&) = delete;
ClustrixMonitor& operator=(const ClustrixMonitor&) = delete;

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

@ -15,7 +15,7 @@
#include <maxscale/ccdefs.hh>
#include <maxscale/monitor.hh>
class CsMonitor : public maxscale::MonitorInstanceSimple
class CsMonitor : public maxscale::MonitorWorkerSimple
{
public:
CsMonitor(const CsMonitor&) = delete;

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

@ -85,7 +85,7 @@ void GaleraMonitor::diagnostics(DCB* dcb) const
json_t* GaleraMonitor::diagnostics_json() const
{
json_t* rval = MonitorInstance::diagnostics_json();
json_t* rval = MonitorWorker::diagnostics_json();
json_object_set_new(rval, "disable_master_failback", json_boolean(m_disableMasterFailback));
json_object_set_new(rval, "disable_master_role_setting", json_boolean(m_disableMasterRoleSetting));
json_object_set_new(rval, "root_node_as_master", json_boolean(m_root_node_as_master));

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

@ -36,7 +36,7 @@ struct GaleraNode
typedef std::unordered_map<MXS_MONITORED_SERVER*, GaleraNode> NodeMap;
class GaleraMonitor : public maxscale::MonitorInstanceSimple
class GaleraMonitor : public maxscale::MonitorWorkerSimple
{
public:
GaleraMonitor(const GaleraMonitor&) = delete;

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

@ -19,7 +19,7 @@
* @file grmon.hh A MySQL Group Replication cluster monitor
*/
class GRMon : public maxscale::MonitorInstanceSimple
class GRMon : public maxscale::MonitorWorkerSimple
{
public:
GRMon(const GRMon&) = delete;

16
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -320,7 +320,7 @@ json_t* MariaDBMonitor::diagnostics_json() const
json_t* MariaDBMonitor::to_json() const
{
json_t* rval = MonitorInstance::diagnostics_json();
json_t* rval = MonitorWorker::diagnostics_json();
json_object_set_new(rval, "master", m_master == NULL ? json_null() : json_string(m_master->name()));
json_object_set_new(rval,
"master_gtid_domain_id",
@ -407,7 +407,7 @@ void MariaDBMonitor::pre_loop()
{
// MonitorInstance reads the journal and has the last known master in its m_master member variable.
// Write the corresponding MariaDBServer into the class-specific m_master variable.
auto journal_master = MonitorInstance::m_master;
auto journal_master = MonitorWorker::m_master;
if (journal_master)
{
// This is somewhat questionable, as the journal only contains status bits but no actual topology
@ -496,12 +496,12 @@ void MariaDBMonitor::tick()
// Before exiting, we need to store the current master into the m_master
// member variable of MonitorInstance so that the right server will be
// stored to the journal.
MonitorInstance::m_master = m_master ? m_master->m_server_base : NULL;
MonitorWorker::m_master = m_master ? m_master->m_server_base : NULL;
}
void MariaDBMonitor::process_state_changes()
{
MonitorInstance::process_state_changes();
MonitorWorker::process_state_changes();
m_cluster_modified = false;
// Check for manual commands
@ -843,7 +843,7 @@ bool handle_manual_switchover(const MODULECMD_ARG* args, json_t** error_out)
}
else
{
MXS_MONITOR* mon = args->argv[0].value.monitor;
Monitor* mon = args->argv[0].value.monitor;
auto handle = static_cast<MariaDBMonitor*>(mon);
SERVER* promotion_server = (args->argc >= 2) ? args->argv[1].value.server : NULL;
SERVER* demotion_server = (args->argc == 3) ? args->argv[2].value.server : NULL;
@ -871,7 +871,7 @@ bool handle_manual_failover(const MODULECMD_ARG* args, json_t** output)
}
else
{
MXS_MONITOR* mon = args->argv[0].value.monitor;
Monitor* mon = args->argv[0].value.monitor;
auto handle = static_cast<MariaDBMonitor*>(mon);
rv = handle->run_manual_failover(output);
}
@ -898,7 +898,7 @@ bool handle_manual_rejoin(const MODULECMD_ARG* args, json_t** output)
}
else
{
MXS_MONITOR* mon = args->argv[0].value.monitor;
Monitor* mon = args->argv[0].value.monitor;
SERVER* server = args->argv[1].value.server;
auto handle = static_cast<MariaDBMonitor*>(mon);
rv = handle->run_manual_rejoin(server, output);
@ -920,7 +920,7 @@ bool handle_manual_reset_replication(const MODULECMD_ARG* args, json_t** output)
}
else
{
MXS_MONITOR* mon = args->argv[0].value.monitor;
Monitor* mon = args->argv[0].value.monitor;
SERVER* server = args->argv[1].value.server;
auto handle = static_cast<MariaDBMonitor*>(mon);
rv = handle->run_manual_reset_replication(server, output);

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

@ -35,7 +35,7 @@ typedef std::unordered_map<int64_t, MariaDBServer*> IdToServerMap;
typedef std::map<int, ServerArray> CycleMap;
// MariaDB Monitor instance data
class MariaDBMonitor : public maxscale::MonitorInstance
class MariaDBMonitor : public maxscale::MonitorWorker
{
private:
MariaDBMonitor(const MariaDBMonitor&) = delete;

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

@ -56,7 +56,7 @@ void MMMonitor::diagnostics(DCB* dcb) const
json_t* MMMonitor::diagnostics_json() const
{
json_t* rval = MonitorInstance::diagnostics_json();
json_t* rval = MonitorWorker::diagnostics_json();
json_object_set_new(rval, "detect_stale_master", json_boolean(m_detectStaleMaster));
return rval;
}
@ -363,7 +363,7 @@ void MMMonitor::post_tick()
MXS_MONITORED_SERVER* MMMonitor::get_current_master()
{
MXS_MONITOR* mon = m_monitor;
Monitor* mon = m_monitor;
MXS_MONITORED_SERVER* ptr;
ptr = mon->monitored_servers;

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

@ -19,7 +19,7 @@
* @file mmmon.hh - The Multi-Master monitor
*/
class MMMonitor : public maxscale::MonitorInstanceSimple
class MMMonitor : public maxscale::MonitorWorkerSimple
{
public:
MMMonitor(const MMMonitor&) = delete;

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

@ -19,7 +19,7 @@
* @file ndbcclustermon.hh A NDBC cluster monitor
*/
class NDBCMonitor : public maxscale::MonitorInstanceSimple
class NDBCMonitor : public maxscale::MonitorWorkerSimple
{
public:
NDBCMonitor(const NDBCMonitor&) = delete;

12
server/modules/routing/debugcli/debugcmd.cc
View File

@ -532,7 +532,7 @@ static void shutdown_server()
}
static void shutdown_service(DCB* dcb, SERVICE* service);
static void shutdown_monitor(DCB* dcb, MXS_MONITOR* monitor);
static void shutdown_monitor(DCB* dcb, Monitor* monitor);
static void shutdown_listener(DCB* dcb, SERVICE* service, const char* name)
{
@ -625,7 +625,7 @@ struct subcommand syncoptions[] =
};
static void restart_service(DCB* dcb, SERVICE* service);
static void restart_monitor(DCB* dcb, MXS_MONITOR* monitor);
static void restart_monitor(DCB* dcb, Monitor* monitor);
static void restart_listener(DCB* dcb, SERVICE* service, const char* name)
{
@ -1414,7 +1414,7 @@ static void destroyListener(DCB* dcb, SERVICE* service, const char* name)
}
static void destroyMonitor(DCB* dcb, MXS_MONITOR* monitor)
static void destroyMonitor(DCB* dcb, Monitor* monitor)
{
char name[strlen(monitor->name) + 1];
strcpy(name, monitor->name);
@ -1579,7 +1579,7 @@ static void alterServer(DCB* dcb, Server* server,
}
static void alterMonitor(DCB* dcb,
MXS_MONITOR* monitor,
Monitor* monitor,
char* v1,
char* v2,
char* v3,
@ -2714,7 +2714,7 @@ static void show_qc_all(DCB* dcb)
* @param dcb The DCB to use to print messages
* @param monitor The monitor to shutdown
*/
static void shutdown_monitor(DCB* dcb, MXS_MONITOR* monitor)
static void shutdown_monitor(DCB* dcb, Monitor* monitor)
{
monitor_stop(monitor);
}
@ -2725,7 +2725,7 @@ static void shutdown_monitor(DCB* dcb, MXS_MONITOR* monitor)
* @param dcb The DCB to use to print messages
* @param monitor The monitor to restart
*/
static void restart_monitor(DCB* dcb, MXS_MONITOR* monitor)
static void restart_monitor(DCB* dcb, Monitor* monitor)
{
monitor_start(monitor, monitor->parameters);
}

4
server/modules/routing/maxinfo/maxinfo_exec.cc
View File

@ -503,7 +503,7 @@ void exec_shutdown_monitor(DCB* dcb, MAXINFO_TREE* tree)
char errmsg[120];
if (tree && tree->value)
{
MXS_MONITOR* monitor = monitor_find(tree->value);
Monitor* monitor = monitor_find(tree->value);
if (monitor)
{
monitor_stop(monitor);
@ -612,7 +612,7 @@ void exec_restart_monitor(DCB* dcb, MAXINFO_TREE* tree)
char errmsg[120];
if (tree && tree->value)
{
MXS_MONITOR* monitor = monitor_find(tree->value);
Monitor* monitor = monitor_find(tree->value);
if (monitor)
{
monitor_start(monitor, monitor->parameters);