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

MXS-1775 Check disk space in MariaDBMonitor

Browse Source
This commit is contained in:
Johan Wikman
2018-06-05 18:47:10 +03:00
parent 18ece193bb
commit f600b3a769
6 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ void MariaDBMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server
auto i = m_server_info.find(monitored_server);
ss_dassert(i != m_server_info.end());
(*i).second->update_server(m_monitor);
(*i).second->update_server(*this);
}
void MariaDBMonitor::pre_loop()

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

@ -99,6 +99,7 @@ public:
bool manual_rejoin(SERVER* rejoin_server, json_t** output);
protected:
friend class MariaDBServer;
void update_server_status(MXS_MONITORED_SERVER* pMonitored_server);
void pre_loop();
void tick();

14
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -19,6 +19,7 @@
#include <sstream>
#include <maxscale/mysql_utils.h>
#include <maxscale/thread.h>
#include "mariadbmon.hh"
using std::string;
@ -697,13 +698,13 @@ bool MariaDBServer::run_sql_from_file(const string& path, json_t** error_out)
return !error;
}
void MariaDBServer::update_server(MXS_MONITOR* base_monitor)
void MariaDBServer::update_server(MariaDBMonitor& monitor)
{
/* Monitor current node if not in maintenance. */
bool in_maintenance = m_server_base->pending_status & SERVER_MAINT;
if (!in_maintenance)
{
monitor_server(base_monitor);
monitor_server(monitor);
}
/** Increase or reset the error count of the server. */
bool is_running = m_server_base->pending_status & SERVER_RUNNING;
@ -715,10 +716,10 @@ void MariaDBServer::update_server(MXS_MONITOR* base_monitor)
*
* @param base_monitor The cluster monitor.
*/
void MariaDBServer::monitor_server(MXS_MONITOR* base_monitor)
void MariaDBServer::monitor_server(MariaDBMonitor& monitor)
{
MXS_MONITORED_SERVER* mon_srv = m_server_base;
mxs_connect_result_t rval = mon_ping_or_connect_to_db(base_monitor, mon_srv);
mxs_connect_result_t rval = mon_ping_or_connect_to_db(monitor.m_monitor, mon_srv);
MYSQL* conn = mon_srv->con; // mon_ping_or_connect_to_db() may have reallocated the MYSQL struct.
if (mon_connection_is_ok(rval))
@ -751,6 +752,11 @@ void MariaDBServer::monitor_server(MXS_MONITOR* base_monitor)
return;
}
if (monitor.should_update_disk_space_status(m_server_base))
{
monitor.update_disk_space_status(m_server_base);
}
string errmsg;
bool query_ok = false;
/* Query different things depending on server version/type. */

5
server/modules/monitor/mariadbmon/mariadbserver.hh
View File

@ -25,6 +25,7 @@ enum print_repl_warnings_t
};
class QueryResult;
class MariaDBMonitor;
class MariaDBServer;
// Server pointer array
typedef std::vector<MariaDBServer*> ServerArray;
@ -333,7 +334,7 @@ public:
*
* @param base_monitor The base monitor object monitoring this server. Required for connection settings.
*/
void update_server(MXS_MONITOR* base_monitor);
void update_server(MariaDBMonitor& monitor);
/**
* Clear server pending status flags.
@ -350,7 +351,7 @@ public:
void set_status(uint64_t bits);
private:
void monitor_server(MXS_MONITOR* base_monitor);
void monitor_server(MariaDBMonitor& monitor);
bool update_slave_status(std::string* errmsg_out = NULL);
void update_server_info();
};