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

Merge branch '2.0' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2016-12-22 13:40:16 +02:00
parent c7dfd1b0bd 68965639d2
commit 520d28b27d
13 changed files with 241 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/readwritesplit/rwsplit_route_stmt.c
View File

@ -1175,6 +1175,14 @@ bool handle_master_is_target(ROUTER_INSTANCE *inst, ROUTER_CLIENT_SES *rses,
if (rses->rses_config.rw_master_failure_mode == RW_ERROR_ON_WRITE)
{
succp = send_readonly_error(rses->client_dcb);
if (rses->rses_master_ref && BREF_IS_IN_USE(rses->rses_master_ref))
{
close_failed_bref(rses->rses_master_ref, true);
RW_CHK_DCB(rses->rses_master_ref, rses->rses_master_ref->bref_dcb);
dcb_close(rses->rses_master_ref->bref_dcb);
RW_CLOSE_BREF(rses->rses_master_ref);
}
}
else
{