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

MXS-2271 Rename MXS_MONITORED_SERVER to MonitorServer

Browse Source
This commit is contained in:
Esa Korhonen
2019-03-13 11:24:05 +02:00
parent 6042a53cb3
commit 6b14479b6c
22 changed files with 145 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@
using std::string;
using maxbase::string_printf;
using maxscale::Monitor;
using maxscale::MXS_MONITORED_SERVER;
using maxscale::MonitorServer;
// Config parameter names
const char* const CN_AUTO_FAILOVER = "auto_failover";
@ -134,7 +134,7 @@ MariaDBServer* MariaDBMonitor::get_server(int64_t id)
return (found != m_servers_by_id.end()) ? (*found).second : NULL;
}
MariaDBServer* MariaDBMonitor::get_server(MXS_MONITORED_SERVER* mon_server)
MariaDBServer* MariaDBMonitor::get_server(MonitorServer* mon_server)
{
return get_server(mon_server->server);
}
@ -336,7 +336,7 @@ json_t* MariaDBMonitor::to_json() const
*/
void MariaDBMonitor::update_server(MariaDBServer* server)
{
MXS_MONITORED_SERVER* mon_srv = server->m_server_base;
MonitorServer* mon_srv = server->m_server_base;
mxs_connect_result_t conn_status = mon_srv->ping_or_connect(m_settings.conn_settings);
MYSQL* conn = mon_srv->con; // mon_ping_or_connect_to_db() may have reallocated the MYSQL struct.
@ -423,7 +423,7 @@ void MariaDBMonitor::pre_loop()
void MariaDBMonitor::tick()
{
/* Update MXS_MONITORED_SERVER->pending_status. This is where the monitor loop writes it's findings.
/* Update MonitorServer->pending_status. This is where the monitor loop writes it's findings.
* Also, backup current status so that it can be compared to any deduced state. */
for (auto srv : m_servers)
{
@ -636,7 +636,7 @@ void MariaDBMonitor::update_external_master()
void MariaDBMonitor::log_master_changes()
{
MXS_MONITORED_SERVER* root_master = m_master ? m_master->m_server_base : NULL;
MonitorServer* root_master = m_master ? m_master->m_server_base : NULL;
if (root_master && root_master->status_changed()
&& !(root_master->pending_status & SERVER_WAS_MASTER))
{

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

@ -251,7 +251,7 @@ private:
MariaDBServer* get_server(const std::string& host, int port);
MariaDBServer* get_server(int64_t id);
MariaDBServer* get_server(mxs::MXS_MONITORED_SERVER* mon_server);
MariaDBServer* get_server(mxs::MonitorServer* mon_server);
MariaDBServer* get_server(SERVER* server);
// Cluster discovery and status assignment methods, top levels

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

@ -28,9 +28,9 @@ using maxbase::Duration;
using maxbase::StopWatch;
using maxsql::QueryResult;
using Guard = std::lock_guard<std::mutex>;
using maxscale::MXS_MONITORED_SERVER;
using maxscale::MonitorServer;
MariaDBServer::MariaDBServer(MXS_MONITORED_SERVER* monitored_server, int config_index,
MariaDBServer::MariaDBServer(MonitorServer* monitored_server, int config_index,
bool assume_unique_hostnames, bool query_events)
: m_server_base(monitored_server)
, m_config_index(config_index)

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

@ -73,7 +73,7 @@ struct NodeData
class MariaDBServer
{
public:
MariaDBServer(mxs::MXS_MONITORED_SERVER* monitored_server, int config_index,
MariaDBServer(mxs::MonitorServer* monitored_server, int config_index,
bool assume_unique_hostnames, bool query_events);
class EventInfo
@ -119,7 +119,7 @@ public:
/* Monitored server base class/struct. MariaDBServer does not own the struct, it is not freed
* (or connection closed) when a MariaDBServer is destroyed. */
mxs::MXS_MONITORED_SERVER* m_server_base = NULL;
mxs::MonitorServer* m_server_base = NULL;
/* What position this server has in the monitor config? Used for tiebreaking between servers. */
int m_config_index = 0;

4
server/modules/monitor/mariadbmon/test/test_cycle_find.cc
View File

@ -25,7 +25,7 @@
using std::string;
using std::cout;
using maxscale::MXS_MONITORED_SERVER;
using maxscale::MonitorServer;
// Maximum sizes for array types
const int MAX_CYCLE_SIZE = 10;
@ -159,7 +159,7 @@ void MariaDBMonitor::Test::init_servers(int count)
{
// Server contents mostly undefined
auto base_server = Server::create_test_server();
MXS_MONITORED_SERVER* mon_server = new MXS_MONITORED_SERVER(base_server);
MonitorServer* mon_server = new MonitorServer(base_server);
MariaDBServer* mariadb_server = new MariaDBServer(mon_server, i - 1, m_use_hostnames, true);
if (m_use_hostnames)