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

MXS-1506: Retry interrupted writes

Browse Source 
If a query is interrupted that was sent to the master, it is now
retried. This allows all autocommit queries to be transparently retried if
the server in question fails.
This commit is contained in:
Markus Mäkelä
2018-04-06 12:20:08 +03:00
parent ed0f20708f
commit 196543ef39
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -509,7 +509,12 @@ void RWSplitSession::handleError(GWBUF *errmsgbuf, DCB *problem_dcb,
// We were expecting a response but we aren't going to get one
m_expected_responses--;
if (m_config.master_failure_mode == RW_ERROR_ON_WRITE)
if (can_retry_query())
{
can_continue = true;
retry_query(release_query());
}
else if (m_config.master_failure_mode == RW_ERROR_ON_WRITE)
{
/** In error_on_write mode, the session can continue even
* if the master is lost. Send a read-only error to
@ -518,7 +523,7 @@ void RWSplitSession::handleError(GWBUF *errmsgbuf, DCB *problem_dcb,
send_readonly_error(m_client);
}
if (!SERVER_IS_MASTER(srv) && !srv->master_err_is_logged)
if (!can_continue && !SERVER_IS_MASTER(srv) && !srv->master_err_is_logged)
{
ss_dassert(backend);
MXS_ERROR("Server %s (%s) lost the master status while waiting"