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

Add gtid event in reset-replication

Browse Source 
Adds a "FLUSH TABLES" command at the end so that the new master has a non-empty
gtid_binlog_pos after the operation.
This commit is contained in:
Esa Korhonen 2018-11-12 18:22:13 +02:00
parent 14e38e4e08
commit a377a9fc5a
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,29 +310,32 @@ bool MariaDBMonitor::manual_reset_replication(SERVER* master_server, json_t** er
if (!error) if (!error)
{ {
// Step 6: Enable writing and events on new master. // Step 6: Enable writing and events on new master, add gtid event.
string error_msg; string error_msg;
if (new_master->execute_cmd("SET GLOBAL read_only=0;", &error_msg)) if (new_master->execute_cmd("SET GLOBAL read_only=0;", &error_msg))
{ {
// Point of no return, perform later steps even if an error occurs.
m_next_master = new_master; m_next_master = new_master;
if (!new_master->enable_events(error_out))
if (m_handle_event_scheduler)
{
if (!new_master->enable_events(error_out))
{
error = true;
PRINT_MXS_JSON_ERROR(error_out, "Could not enable events on '%s': %s",
new_master->name(), error_msg.c_str());
}
}
// Add an event to the new master so that it has a non-empty gtid_current_pos.
if (!new_master->execute_cmd("FLUSH TABLES;", &error_msg))
{ {
error = true; error = true;
PRINT_MXS_JSON_ERROR(error_out, "Could not add event to %s: %s",
new_master->name(), error_msg.c_str());
} }
}
else
{
error = true;
PRINT_MXS_JSON_ERROR(error_out,
"Could not enable writes on '%s': %s",
new_master->name(), error_msg.c_str());
}
if (m_next_master == new_master)
{
// Step 7: Set all slaves to replicate from the master. Perform this step even if enabling
// events failed.
// Step 7: Set all slaves to replicate from the master.
// The following commands are only sent to slaves. // The following commands are only sent to slaves.
auto location = std::find(targets.begin(), targets.end(), new_master); auto location = std::find(targets.begin(), targets.end(), new_master);
targets.erase(location); targets.erase(location);
@ -352,7 +355,14 @@ bool MariaDBMonitor::manual_reset_replication(SERVER* master_server, json_t** er
"Some servers were not redirected to '%s'.", new_master->name()); "Some servers were not redirected to '%s'.", new_master->name());
} }
} }
else
{
error = true;
PRINT_MXS_JSON_ERROR(error_out, "Could not enable writes on '%s': %s",
new_master->name(), error_msg.c_str());
}
} }
if (error) if (error)
{ {
PRINT_MXS_JSON_ERROR(error_out, "Replication reset failed or succeeded only partially. " PRINT_MXS_JSON_ERROR(error_out, "Replication reset failed or succeeded only partially. "