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

Remove ndbclustermon

Browse Source
This commit is contained in:
Markus Mäkelä
2019-04-24 14:02:18 +03:00
parent 88a9ca8b68
commit 1e84742cbb
4 changed files with 0 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/modules/monitor/CMakeLists.txt
View File

@ -4,4 +4,3 @@ add_subdirectory(csmon)
add_subdirectory(galeramon)
add_subdirectory(grmon)
add_subdirectory(mariadbmon)
add_subdirectory(ndbclustermon)

5
server/modules/monitor/ndbclustermon/CMakeLists.txt
View File

@ -1,5 +0,0 @@
add_library(ndbclustermon SHARED ndbclustermon.cc)
target_link_libraries(ndbclustermon maxscale-common)
add_dependencies(ndbclustermon pcre2)
set_target_properties(ndbclustermon PROPERTIES VERSION "2.1.0" LINK_FLAGS -Wl,-z,defs)
install_module(ndbclustermon core)

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

@ -1,155 +0,0 @@
/*
* Copyright (c) 2016 MariaDB Corporation Ab
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2022-01-01
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General
* Public License.
*/
/**
* @file ndbcluster_mon.c - A MySQL cluster SQL node monitor
*/
#define MXS_MODULE_NAME "ndbclustermon"
#include "ndbclustermon.hh"
#include <maxscale/alloc.h>
#include <maxscale/mysql_utils.hh>
NDBCMonitor::NDBCMonitor(const std::string& name, const std::string& module)
: MonitorWorkerSimple(name, module)
{
}
NDBCMonitor::~NDBCMonitor()
{
}
// static
NDBCMonitor* NDBCMonitor::create(const std::string& name, const std::string& module)
{
return new NDBCMonitor(name, module);
}
bool NDBCMonitor::has_sufficient_permissions()
{
return test_permissions("SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'");
}
void NDBCMonitor::update_server_status(mxs::MonitorServer* monitored_server)
{
MYSQL_ROW row;
MYSQL_RES* result;
int isjoined = 0;
/* get server version string */
mxs_mysql_update_server_version(monitored_server->server, monitored_server->con);
/* Check if the the SQL node is able to contact one or more data nodes */
if (mxs_mysql_query(monitored_server->con, "SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'") == 0
&& (result = mysql_store_result(monitored_server->con)) != NULL)
{
if (mysql_field_count(monitored_server->con) < 2)
{
mysql_free_result(result);
MXS_ERROR("Unexpected result for \"SHOW STATUS LIKE "
"'Ndb_number_of_ready_data_nodes'\". Expected 2 columns."
" MySQL Version: %s",
monitored_server->server->version_string().c_str());
return;
}
while ((row = mysql_fetch_row(result)))
{
if (atoi(row[1]) > 0)
{
isjoined = 1;
}
}
mysql_free_result(result);
}
else
{
monitored_server->mon_report_query_error();
}
/* Check the the SQL node id in the MySQL cluster */
if (mxs_mysql_query(monitored_server->con, "SHOW STATUS LIKE 'Ndb_cluster_node_id'") == 0
&& (result = mysql_store_result(monitored_server->con)) != NULL)
{
if (mysql_field_count(monitored_server->con) < 2)
{
mysql_free_result(result);
MXS_ERROR("Unexpected result for \"SHOW STATUS LIKE 'Ndb_cluster_node_id'\". "
"Expected 2 columns."
" MySQL Version: %s",
monitored_server->server->version_string().c_str());
return;
}
long cluster_node_id = -1;
while ((row = mysql_fetch_row(result)))
{
cluster_node_id = strtol(row[1], NULL, 10);
if ((errno == ERANGE && (cluster_node_id == LONG_MAX
|| cluster_node_id == LONG_MIN)) || (errno != 0 && cluster_node_id == 0))
{
cluster_node_id = -1;
}
monitored_server->server->node_id = cluster_node_id;
}
mysql_free_result(result);
}
else
{
monitored_server->mon_report_query_error();
}
if (isjoined)
{
monitored_server->set_pending_status(SERVER_NDB);
}
else
{
monitored_server->clear_pending_status(SERVER_NDB);
}
}
/**
* The module entry point routine. It is this routine that
* must populate the structure that is referred to as the
* "module object", this is a structure with the set of
* external entry points for this module.
*
* @return The module object
*/
extern "C" MXS_MODULE* MXS_CREATE_MODULE()
{
MXS_NOTICE("Initialise the MySQL Cluster Monitor module.");
static MXS_MODULE info =
{
MXS_MODULE_API_MONITOR,
MXS_MODULE_BETA_RELEASE,
MXS_MONITOR_VERSION,
"A MySQL cluster SQL node monitor",
"V2.1.0",
MXS_NO_MODULE_CAPABILITIES,
&maxscale::MonitorApi<NDBCMonitor>::s_api,
NULL, /* Process init. */
NULL, /* Process finish. */
NULL, /* Thread init. */
NULL, /* Thread finish. */
{
{MXS_END_MODULE_PARAMS} // No parameters
}
};
return &info;
}

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

@ -1,37 +0,0 @@
/*
* Copyright (c) 2018 MariaDB Corporation Ab
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file and at www.mariadb.com/bsl11.
*
* Change Date: 2022-01-01
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2 or later of the General
* Public License.
*/
#pragma once
#include <maxscale/ccdefs.hh>
#include <maxscale/monitor.hh>
/**
* @file ndbcclustermon.hh A NDBC cluster monitor
*/
class NDBCMonitor : public maxscale::MonitorWorkerSimple
{
public:
NDBCMonitor(const NDBCMonitor&) = delete;
NDBCMonitor& operator=(const NDBCMonitor&) = delete;
~NDBCMonitor();
static NDBCMonitor* create(const std::string& name, const std::string& module);
protected:
bool has_sufficient_permissions();
void update_server_status(mxs::MonitorServer* monitored_server);
private:
NDBCMonitor(const std::string& name, const std::string& module);
};