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-21 15:22:54 +02:00
parent 296bac45c1 bd8b6dbc6f
commit d03787b2c9
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -830,7 +830,7 @@ bool MariaDBMonitor::switchover_demote_master(MXS_MONITORED_SERVER* current_mast
bool success = false; bool success = false;
bool query_error = false; bool query_error = false;
MYSQL* conn = current_master->con; MYSQL* conn = current_master->con;
const char* query = ""; const char* query = ""; // The next query to execute. Used also for error printing.
// The presence of an external master changes several things. // The presence of an external master changes several things.
const bool external_master = SERVER_IS_SLAVE_OF_EXTERNAL_MASTER(current_master->server); const bool external_master = SERVER_IS_SLAVE_OF_EXTERNAL_MASTER(current_master->server);
@ -846,6 +846,7 @@ bool MariaDBMonitor::switchover_demote_master(MXS_MONITORED_SERVER* current_mast
} }
} }
bool error_fetched = false;
string error_desc; string error_desc;
if (!query_error) if (!query_error)
{ {
@ -879,27 +880,39 @@ bool MariaDBMonitor::switchover_demote_master(MXS_MONITORED_SERVER* current_mast
{ {
// Somehow, a step after "SET read_only" failed. Try to set read_only back to 0. It may not // Somehow, a step after "SET read_only" failed. Try to set read_only back to 0. It may not
// work since the connection is likely broken. // work since the connection is likely broken.
error_desc = mysql_error(conn); error_desc = mysql_error(conn); // Read connection error before next step.
error_fetched = true;
mxs_mysql_query(conn, "SET GLOBAL read_only=0;"); mxs_mysql_query(conn, "SET GLOBAL read_only=0;");
} }
} }
} }
if (query_error) if (query_error && !error_fetched)
{ {
error_desc = mysql_error(conn); error_desc = mysql_error(conn);
} }
if (!success) if (!success)
{ {
if (error_desc.empty()) if (query_error)
{ {
PRINT_MXS_JSON_ERROR(err_out, "Demotion failed due to an error in updating gtid:s."); if (error_desc.empty())
{
const char UNKNOWN_ERROR[] = "Demotion failed due to an unknown error when executing "
"a query. Query: '%s'.";
PRINT_MXS_JSON_ERROR(err_out, UNKNOWN_ERROR, query);
}
else
{
const char KNOWN_ERROR[] = "Demotion failed due to a query error: '%s'. Query: '%s'.";
PRINT_MXS_JSON_ERROR(err_out, KNOWN_ERROR, error_desc.c_str(), query);
}
} }
else else
{ {
PRINT_MXS_JSON_ERROR(err_out, "Demotion failed due to a query error: '%s'. Query: '%s'.", const char GTID_ERROR[] = "Demotion failed due to an error in updating gtid:s. "
error_desc.c_str(), query); "Check log for more details.";
PRINT_MXS_JSON_ERROR(err_out, GTID_ERROR);
} }
} }
return success; return success;