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

MXS-359: Fix master_failure_mode=fail_instantly

Browse Source 
The connection was not closed when master_failure_mode=fail_instantly was
used. This caused rwsplit_readonly to fail.
This commit is contained in:
Markus Mäkelä
2018-03-20 11:54:19 +02:00
parent 0fde6e501d
commit 3e0b3db65e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -1389,8 +1389,11 @@ static void handleError(MXS_ROUTER *instance,
* can't be sure whether it was executed or not. In this * can't be sure whether it was executed or not. In this
* case the safest thing to do is to close the client * case the safest thing to do is to close the client
* connection. */ * connection. */
if (rses->rses_config.master_failure_mode != RW_FAIL_INSTANTLY)
{
can_continue = true; can_continue = true;
} }
}
else if (!SERVER_IS_MASTER(srv) && !srv->master_err_is_logged) else if (!SERVER_IS_MASTER(srv) && !srv->master_err_is_logged)
{ {
ss_dassert(backend); ss_dassert(backend);