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

Merge commit 'a7c21eee88c3c2530c06fea8a20c718004eed244' into develop-2.0-merge

Browse Source
This commit is contained in:
Markus Makela
2016-11-16 12:57:23 +02:00
parent 3c15b58891 a7c21eee88
commit 44a55d231f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1331,12 +1331,10 @@ static void handleError(ROUTER *instance, void *router_session,
* If master has lost its Master status error can't be * If master has lost its Master status error can't be
* handled so that session could continue. * handled so that session could continue.
*/ */
if (rses->rses_master_ref && rses->rses_master_ref->bref_dcb == problem_dcb && if (rses->rses_master_ref && rses->rses_master_ref->bref_dcb == problem_dcb)
!SERVER_IS_MASTER(rses->rses_master_ref->ref->server))
{ {
SERVER *srv = rses->rses_master_ref->ref->server; SERVER *srv = rses->rses_master_ref->ref->server;
backend_ref_t *bref; backend_ref_t *bref = get_bref_from_dcb(rses, problem_dcb);
bref = get_bref_from_dcb(rses, problem_dcb);
bool can_continue = false; bool can_continue = false;
if (rses->rses_config.rw_master_failure_mode != RW_FAIL_INSTANTLY && if (rses->rses_config.rw_master_failure_mode != RW_FAIL_INSTANTLY &&
@ -1353,7 +1351,7 @@ static void handleError(ROUTER *instance, void *router_session,
* connection. */ * connection. */
can_continue = true; can_continue = true;
} }
else if (!srv->master_err_is_logged) else if (!SERVER_IS_MASTER(srv) && !srv->master_err_is_logged)
{ {
MXS_ERROR("Server %s:%d lost the master status. Readwritesplit " MXS_ERROR("Server %s:%d lost the master status. Readwritesplit "
"service can't locate the master. Client sessions " "service can't locate the master. Client sessions "