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

Fix read-only mode error handling in readwritesplit

Browse Source 
In read-only modes, readwritesplit would always continue even if an active
statement execution was in progress.
This commit is contained in:
Markus Makela
2016-11-02 12:12:36 +02:00
parent 37a2c8cecf
commit 572d466fad
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4314,23 +4314,7 @@ static void handleError(ROUTER *instance, void *router_session,
SERVER *srv = rses->rses_master_ref->bref_backend->backend_server; SERVER *srv = rses->rses_master_ref->bref_backend->backend_server;
backend_ref_t *bref; backend_ref_t *bref;
bref = get_bref_from_dcb(rses, problem_dcb); bref = get_bref_from_dcb(rses, problem_dcb);
if (bref != NULL) bool can_continue = false;
{
CHK_BACKEND_REF(bref);
bref_clear_state(bref, BREF_IN_USE);
bref_set_state(bref, BREF_CLOSED);
if (BREF_IS_WAITING_RESULT(bref))
{
bref_clear_state(bref, BREF_WAITING_RESULT);
}
}
else
{
MXS_ERROR("server %s:%d lost the "
"master status but could not locate the "
"corresponding backend ref.",
srv->name, srv->port);
}
if (rses->rses_config.rw_master_failure_mode != RW_FAIL_INSTANTLY && if (rses->rses_config.rw_master_failure_mode != RW_FAIL_INSTANTLY &&
(bref == NULL || !BREF_IS_WAITING_RESULT(bref))) (bref == NULL || !BREF_IS_WAITING_RESULT(bref)))
@ -4344,20 +4328,33 @@ static void handleError(ROUTER *instance, void *router_session,
* 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. */
*succp = true; can_continue = true;
}
else if (!srv->master_err_is_logged)
{
MXS_ERROR("Server %s:%d lost the master status. Readwritesplit "
"service can't locate the master. Client sessions "
"will be closed.", srv->name, srv->port);
srv->master_err_is_logged = true;
}
*succp = can_continue;
if (bref != NULL)
{
CHK_BACKEND_REF(bref);
bref_clear_state(bref, BREF_IN_USE);
bref_set_state(bref, BREF_CLOSED);
if (BREF_IS_WAITING_RESULT(bref))
{
bref_clear_state(bref, BREF_WAITING_RESULT);
}
} }
else else
{ {
if (!srv->master_err_is_logged) MXS_ERROR("Server %s:%d lost the master status but could not locate the "
{ "corresponding backend ref.", srv->name, srv->port);
MXS_ERROR("server %s:%d lost the "
"master status. Readwritesplit "
"service can't locate the master. "
"Client sessions will be closed.",
srv->name, srv->port);
srv->master_err_is_logged = true;
}
*succp = false;
} }
} }
else else