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

MXS-2546 Remove external master tracking

Browse Source 
It was only used for logging.
This commit is contained in:
Esa Korhonen 2019-07-17 13:39:49 +03:00
parent 835049d506
commit 0257e6e690
2 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,8 +88,6 @@ void MariaDBMonitor::reset_server_info()
assign_new_master(NULL);
m_next_master = NULL;
m_master_gtid_domain = GTID_DOMAIN_UNKNOWN;
m_external_master_host.clear();
m_external_master_port = PORT_UNKNOWN;
// Next, initialize the data.
for (auto mon_server : servers())
@ -464,7 +462,6 @@ void MariaDBMonitor::tick()
{
// Update cluster-wide values dependant on the current master.
update_gtid_domain();
update_external_master();
}
/* Set low disk space slaves to maintenance. This needs to happen after roles have been assigned.
@ -591,49 +588,6 @@ void MariaDBMonitor::update_gtid_domain()
m_master_gtid_domain = domain;
}
void MariaDBMonitor::update_external_master()
{
if (m_master->is_slave_of_ext_master())
{
mxb_assert(!m_master->m_slave_status.empty() && !m_master->m_node.external_masters.empty());
// TODO: Add support for multiple external masters.
auto& master_sstatus = m_master->m_slave_status[0];
if (master_sstatus.master_host != m_external_master_host
|| master_sstatus.master_port != m_external_master_port)
{
const string new_ext_host = master_sstatus.master_host;
const int new_ext_port = master_sstatus.master_port;
if (m_external_master_port == PORT_UNKNOWN)
{
MXS_NOTICE("Cluster master server is replicating from an external master: %s:%d",
new_ext_host.c_str(),
new_ext_port);
}
else
{
MXS_NOTICE("The external master of the cluster has changed: %s:%d -> %s:%d.",
m_external_master_host.c_str(),
m_external_master_port,
new_ext_host.c_str(),
new_ext_port);
}
m_external_master_host = new_ext_host;
m_external_master_port = new_ext_port;
}
}
else
{
if (m_external_master_port != PORT_UNKNOWN)
{
MXS_NOTICE("Cluster lost the external master. Previous one was at: [%s]:%d",
m_external_master_host.c_str(),
m_external_master_port);
}
m_external_master_host.clear();
m_external_master_port = PORT_UNKNOWN;
}
}
void MariaDBMonitor::log_master_changes()
{
MonitorServer* root_master = m_master ? m_master->m_server_base : NULL;

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

@ -194,8 +194,6 @@ private:
// Miscellaneous info
int64_t m_master_gtid_domain = GTID_DOMAIN_UNKNOWN; /* gtid_domain_id most recently seen on
* the master */
std::string m_external_master_host; /* External master host, for fail/switchover */
int m_external_master_port = PORT_UNKNOWN; /* External master port */
// Fields controlling logging of various events. TODO: Check these
bool m_log_no_master {true}; /* Should it be logged that there is no master? */
@ -291,7 +289,7 @@ private:
int running_slaves(MariaDBServer* search_root);
bool cycle_has_master_server(ServerArray& cycle_servers);
void update_gtid_domain();
void update_external_master();
void update_master_cycle_info();
bool is_candidate_valid(MariaDBServer* cand, RequireRunning req_running, std::string* why_not = nullptr);