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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Esa Korhonen
2019-03-11 15:46:18 +02:00
parent 1c3a5bda83 c8078c99e5
commit 8abe1c8448
4 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1701,7 +1701,8 @@ MariaDBMonitor::switchover_prepare(SERVER* promotion_server, SERVER* demotion_se
m_promote_sql_file,
demotion_target->m_slave_status, demotion_target->m_enabled_events);
ServerOperation demotion(demotion_target, master_swap, m_handle_event_scheduler,
m_demote_sql_file, promotion_target->m_slave_status, {} /* unused */);
m_demote_sql_file, promotion_target->m_slave_status,
EventNameSet() /* unused */);
GeneralOpData general(m_replication_user, m_replication_password, error_out, time_limit);
rval.reset(new SwitchoverParams(promotion, demotion, general));
}

31
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -157,7 +157,7 @@ bool MariaDBServer::execute_cmd_time_limit(const std::string& cmd, maxbase::Dura
std::string* errmsg_out)
{
StopWatch timer;
string cmd_prefix;
string max_stmt_time;
int connector_timeout = -1;
if (m_capabilities.max_statement_time)
{
@ -166,14 +166,15 @@ bool MariaDBServer::execute_cmd_time_limit(const std::string& cmd, maxbase::Dura
mxb_assert(rv == 0);
if (connector_timeout > 0)
{
cmd_prefix = string_printf("SET STATEMENT max_statement_time=%i FOR ", connector_timeout);
max_stmt_time = string_printf("SET STATEMENT max_statement_time=%i FOR ", connector_timeout);
}
}
string command = cmd_prefix + cmd;
const string command = max_stmt_time + cmd;
// If a query lasts less than 1s, sleep so that at most 1 query/s is sent.
// This prevents busy-looping when faced with some network errors.
const Duration min_query_time(1.0);
// Even if time is up, try at least once.
bool cmd_success = false;
bool keep_trying = true;
@ -187,17 +188,27 @@ bool MariaDBServer::execute_cmd_time_limit(const std::string& cmd, maxbase::Dura
// Check if there is time to retry.
Duration time_remaining = time_limit - timer.split();
bool non_fatal_connector_err = maxsql::mysql_is_net_error(errornum);
keep_trying = (time_remaining.secs() > 0)
// either a connector-c timeout
&& (maxsql::mysql_is_net_error(errornum)
// or query was interrupted by max_statement_time.
|| (!cmd_prefix.empty() && errornum == ER_STATEMENT_TIMEOUT));
// Either a connector-c timeout or query was interrupted by max_statement_time.
&& (non_fatal_connector_err || (!max_stmt_time.empty() && errornum == ER_STATEMENT_TIMEOUT));
if (!cmd_success)
{
if (keep_trying)
{
MXS_WARNING("Query '%s' timed out on '%s': Retrying with %.1f seconds left.",
command.c_str(), name(), time_remaining.secs());
string retrying = string_printf("Retrying with %.1f seconds left.", time_remaining.secs());
if (non_fatal_connector_err)
{
MXS_WARNING("%s %s", error_msg.c_str(), retrying.c_str());
}
else
{
// Timed out because of max_statement_time.
MXS_WARNING("Query '%s' timed out on '%s'. %s",
command.c_str(), name(), retrying.c_str());
}
if (query_time < min_query_time)
{
Duration query_sleep = min_query_time - query_time;
@ -207,7 +218,7 @@ bool MariaDBServer::execute_cmd_time_limit(const std::string& cmd, maxbase::Dura
}
else if (errmsg_out)
{
*errmsg_out = error_msg; // The error string already has all required info.
*errmsg_out = error_msg; // The error string already has all required info.
}
}
}

3
server/modules/monitor/mariadbmon/server_utils.cc
View File

@ -169,7 +169,8 @@ ServerOperation::ServerOperation(MariaDBServer* target, bool was_is_master, bool
ServerOperation::ServerOperation(MariaDBServer* target, bool was_is_master, bool handle_events,
const std::string& sql_file)
: ServerOperation(target, was_is_master, handle_events, sql_file, {}, {})
: ServerOperation(target, was_is_master, handle_events, sql_file,
SlaveStatusArray() /* empty */, EventNameSet() /* empty */)
{
}