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

Avoid using obsolete functions in reset-replication

Browse Source 
Removes some duplicate functions.
This commit is contained in:
Esa Korhonen
2019-06-07 14:02:59 +03:00
parent 190c0ac634
commit b49aeae1c8
4 changed files with 35 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
server/modules/monitor/mariadbmon/cluster_manipulation.cc
View File

@ -354,22 +354,43 @@ bool MariaDBMonitor::manual_reset_replication(SERVER* master_server, json_t** er
// Step 7: Set all slaves to replicate from the master.
// The following commands are only sent to slaves.
auto location = std::find(targets.begin(), targets.end(), new_master);
targets.erase(location);
// TODO: the following call does stop slave & reset slave again. Fix this later, although it
// doesn't cause error.
ServerArray dummy;
if ((size_t)redirect_slaves(new_master, targets, &dummy) == targets.size())
ServerArray slaves;
for (auto target : targets)
{
// TODO: Properly check check slave IO/SQL threads.
MXS_NOTICE("All slaves redirected successfully.");
if (target != new_master)
{
slaves.push_back(target);
}
}
else
if (!slaves.empty())
{
error = true;
PRINT_MXS_JSON_ERROR(error_out,
"Some servers were not redirected to '%s'.", new_master->name());
SlaveStatus new_conn;
SERVER* new_master_srv = new_master->m_server_base->server;
new_conn.master_host = new_master_srv->address;
new_conn.master_port = new_master_srv->port;
GeneralOpData general(error_out, mxb::Duration(0.0)); // Expect this to complete quickly.
size_t slave_conns_started = 0;
for (auto slave : slaves)
{
if (slave->create_start_slave(general, new_conn))
{
slave_conns_started++;
}
}
ServerArray dummy;
if (slave_conns_started == slaves.size())
{
// TODO: Properly check slave IO/SQL threads.
MXS_NOTICE("All slaves redirected successfully.");
}
else
{
error = true;
PRINT_MXS_JSON_ERROR(error_out,
"Some servers were not redirected to '%s'.", new_master->name());
}
}
}
else
@ -420,33 +441,6 @@ string MariaDBMonitor::generate_change_master_cmd(const string& master_host, int
return change_cmd.str();
}
/**
* Redirects slaves to replicate from another master server.
*
* @param new_master The replication master
* @param slaves An array of slaves
* @param redirected_slaves A vector where to insert successfully redirected slaves.
* @return The number of slaves successfully redirected.
*/
int MariaDBMonitor::redirect_slaves(MariaDBServer* new_master, const ServerArray& slaves,
ServerArray* redirected_slaves)
{
mxb_assert(redirected_slaves != NULL);
MXS_NOTICE("Redirecting slaves to new master.");
string change_cmd = generate_change_master_cmd(new_master->m_server_base->server->address,
new_master->m_server_base->server->port);
int successes = 0;
for (MariaDBServer* slave : slaves)
{
if (slave->redirect_one_slave(change_cmd))
{
successes++;
redirected_slaves->push_back(slave);
}
}
return successes;
}
/**
* Redirect slave connections from the promotion target to replicate from the demotion target and vice versa.
*