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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Esa Korhonen
2018-03-28 13:24:54 +03:00
parent 93cd4e7de3 7209080236
commit f7ea12b8e4
2 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,7 +695,7 @@ static void read_server_variables(MariaDBServer* serv_info)
if (serv_info->version == MYSQL_SERVER_VERSION_100) if (serv_info->version == MYSQL_SERVER_VERSION_100)
{ {
query.erase(query.end() - 1); query.erase(query.end() - 1);
query += ", @@gtid_domain_id;"; query += ", @@global.gtid_domain_id;";
columns = 3; columns = 3;
} }

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

@ -319,21 +319,32 @@ bool MariaDBMonitor::switchover_start_slave(MXS_MONITORED_SERVER* old_master, SE
*/ */
bool MariaDBMonitor::redirect_one_slave(MXS_MONITORED_SERVER* slave, const char* change_cmd) bool MariaDBMonitor::redirect_one_slave(MXS_MONITORED_SERVER* slave, const char* change_cmd)
{ {
bool rval = false; bool success = false;
if (mxs_mysql_query(slave->con, "STOP SLAVE;") == 0 && const char* query = "STOP SLAVE;";
mxs_mysql_query(slave->con, "RESET SLAVE;") == 0 && // To erase any old I/O or SQL errors if (mxs_mysql_query(slave->con, query) == 0)
mxs_mysql_query(slave->con, change_cmd) == 0 &&
mxs_mysql_query(slave->con, "START SLAVE;") == 0)
{ {
rval = true; query = "RESET SLAVE;"; // To erase any old I/O or SQL errors
MXS_NOTICE("Slave '%s' redirected to new master.", slave->server->unique_name); if (mxs_mysql_query(slave->con, query) == 0)
{
query = "CHANGE MASTER TO ..."; // Don't show the real query as it contains a password.
if (mxs_mysql_query(slave->con, change_cmd) == 0)
{
query = "START SLAVE;";
if (mxs_mysql_query(slave->con, query) == 0)
{
success = true;
MXS_NOTICE("Slave '%s' redirected to new master.", slave->server->unique_name);
}
}
}
} }
else
if (!success)
{ {
MXS_WARNING("Slave '%s' redirection failed: '%s'.", slave->server->unique_name, MXS_WARNING("Slave '%s' redirection failed: '%s'. Query: '%s'.", slave->server->unique_name,
mysql_error(slave->con)); mysql_error(slave->con), query);
} }
return rval; return success;
} }
/** /**
@ -453,18 +464,40 @@ bool MariaDBMonitor::join_cluster(MXS_MONITORED_SERVER* server, const char* chan
{ {
/* Server does not have slave connections. This operation can fail, or the resulting /* Server does not have slave connections. This operation can fail, or the resulting
* replication may end up broken. */ * replication may end up broken. */
bool rval = false; bool success = false;
if (mxs_mysql_query(server->con, "SET GLOBAL read_only=1;") == 0 && string error_msg;
mxs_mysql_query(server->con, change_cmd) == 0 && const char* query = "SET GLOBAL read_only=1;";
mxs_mysql_query(server->con, "START SLAVE;") == 0) if (mxs_mysql_query(server->con, query) == 0)
{ {
rval = true; query = "CHANGE MASTER TO ..."; // Don't show the real query as it contains a password.
if (mxs_mysql_query(server->con, change_cmd) == 0)
{
query = "START SLAVE;";
if (mxs_mysql_query(server->con, query) == 0)
{
success = true;
MXS_NOTICE("Standalone server '%s' starting replication.", server->server->unique_name);
}
}
if (!success)
{
// A step after "SET GLOBAL read_only=1" failed, try to undo. First, backup error message.
error_msg = mysql_error(server->con);
mxs_mysql_query(server->con, "SET GLOBAL read_only=0;");
}
} }
else
if (!success)
{ {
mxs_mysql_query(server->con, "SET GLOBAL read_only=0;"); if (error_msg.empty())
{
error_msg = mysql_error(server->con);
}
MXS_WARNING("Standalone server '%s' failed to start replication: '%s'. Query: '%s'.",
server->server->unique_name, error_msg.c_str(), query);
} }
return rval; return success;
} }
/** /**