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

MXS-2271 All monitors inherit from MXS_MONITOR

Browse Source 
Most of the API entrypoints are replaced with virtual functions.
This commit is contained in:
Esa Korhonen
2019-01-18 17:27:41 +02:00
parent 17fc2ba88a
commit dadb6a1a79
19 changed files with 94 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,8 @@ static int compare_node_index(const void*, const void*);
static int compare_node_priority(const void*, const void*);
static bool using_xtrabackup(MXS_MONITORED_SERVER* database, const char* server_string);
GaleraMonitor::GaleraMonitor(MXS_MONITOR* mon)
: maxscale::MonitorInstanceSimple(mon)
, m_disableMasterFailback(0)
GaleraMonitor::GaleraMonitor()
: m_disableMasterFailback(0)
, m_availableWhenDonor(0)
, m_disableMasterRoleSetting(0)
, m_root_node_as_master(false)
@ -60,9 +59,9 @@ GaleraMonitor::~GaleraMonitor()
}
// static
GaleraMonitor* GaleraMonitor::create(MXS_MONITOR* monitor)
GaleraMonitor* GaleraMonitor::create()
{
return new GaleraMonitor(monitor);
return new GaleraMonitor();
}
void GaleraMonitor::diagnostics(DCB* dcb) const

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

@ -43,7 +43,7 @@ public:
GaleraMonitor& operator=(const GaleraMonitor&) = delete;
~GaleraMonitor();
static GaleraMonitor* create(MXS_MONITOR* monitor);
static GaleraMonitor* create();
void diagnostics(DCB* dcb) const;
json_t* diagnostics_json() const;
@ -68,7 +68,7 @@ private:
NodeMap m_info; /**< Contains Galera Cluster variables of all nodes */
int m_cluster_size; /**< How many nodes in the cluster */
GaleraMonitor(MXS_MONITOR* monitor);
GaleraMonitor();
bool detect_cluster_size(const int n_nodes,
const char* candidate_uuid,