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

Check whether server references are active

Browse Source 
Before a query is routed to a backend, the status of the server reference
is checked. This allows the servers that are removed from a service to be
ejected from the list of active servers for active sessions.
This commit is contained in:
Markus Makela
2016-11-07 11:17:01 +02:00
parent 28fc3d2b83
commit 65886dc386
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -543,6 +543,7 @@ bool rwsplit_get_dcb(DCB **p_dcb, ROUTER_CLIENT_SES *rses, backend_type_t btype,
* server, or master. * server, or master.
*/ */
if (BREF_IS_IN_USE((&backend_ref[i])) && if (BREF_IS_IN_USE((&backend_ref[i])) &&
SERVER_REF_IS_ACTIVE(b) &&
(strncasecmp(name, b->server->unique_name, PATH_MAX) == 0) && (strncasecmp(name, b->server->unique_name, PATH_MAX) == 0) &&
(SERVER_IS_SLAVE(&server) || SERVER_IS_RELAY_SERVER(&server) || (SERVER_IS_SLAVE(&server) || SERVER_IS_RELAY_SERVER(&server) ||
SERVER_IS_MASTER(&server))) SERVER_IS_MASTER(&server)))
@ -577,7 +578,7 @@ bool rwsplit_get_dcb(DCB **p_dcb, ROUTER_CLIENT_SES *rses, backend_type_t btype,
* Unused backend or backend which is not master nor * Unused backend or backend which is not master nor
* slave can't be used * slave can't be used
*/ */
if (!BREF_IS_IN_USE(&backend_ref[i]) || if (!BREF_IS_IN_USE(&backend_ref[i]) || !SERVER_REF_IS_ACTIVE(b) ||
(!SERVER_IS_MASTER(&server) && !SERVER_IS_SLAVE(&server))) (!SERVER_IS_MASTER(&server) && !SERVER_IS_SLAVE(&server)))
{ {
continue; continue;
@ -665,27 +666,37 @@ bool rwsplit_get_dcb(DCB **p_dcb, ROUTER_CLIENT_SES *rses, backend_type_t btype,
*/ */
if (btype == BE_MASTER) if (btype == BE_MASTER)
{ {
if (master_bref) if (master_bref && SERVER_REF_IS_ACTIVE(master_bref->ref))
{ {
/** It is possible for the server status to change at any point in time /** It is possible for the server status to change at any point in time
* so copying it locally will make possible error messages * so copying it locally will make possible error messages
* easier to understand */ * easier to understand */
SERVER server; SERVER server;
server.status = master_bref->ref->server->status; server.status = master_bref->ref->server->status;
if (BREF_IS_IN_USE(master_bref) && SERVER_IS_MASTER(&server))
if (BREF_IS_IN_USE(master_bref))
{ {
*p_dcb = master_bref->bref_dcb; if (SERVER_IS_MASTER(&server))
succp = true; {
/** if bref is in use DCB should not be closed */ *p_dcb = master_bref->bref_dcb;
ss_dassert(master_bref->bref_dcb->state != DCB_STATE_ZOMBIE); succp = true;
/** if bref is in use DCB should not be closed */
ss_dassert(master_bref->bref_dcb->state != DCB_STATE_ZOMBIE);
}
else
{
MXS_ERROR("Server '%s' should be master but "
"is %s instead and can't be chosen as the master.",
master_bref->ref->server->unique_name,
STRSRVSTATUS(&server));
succp = false;
}
} }
else else
{ {
MXS_ERROR("Server at %s:%d should be master but " MXS_ERROR("Server '%s' is not in use and can't be "
"is %s instead and can't be chosen to master.", "chosen as the master.",
master_bref->ref->server->name, master_bref->ref->server->unique_name);
master_bref->ref->server->port,
STRSRVSTATUS(&server));
succp = false; succp = false;
} }
} }

7
server/modules/routing/readwritesplit/rwsplit_select_backends.c
View File

@ -106,7 +106,8 @@ bool select_connect_backend_servers(backend_ref_t **p_master_ref,
SERVER_REF *master_host = get_root_master(backend_ref, router_nservers); SERVER_REF *master_host = get_root_master(backend_ref, router_nservers);
if (router->rwsplit_config.rw_master_failure_mode == RW_FAIL_INSTANTLY && if (router->rwsplit_config.rw_master_failure_mode == RW_FAIL_INSTANTLY &&
(master_host == NULL || SERVER_IS_DOWN(master_host->server))) (master_host == NULL || !SERVER_REF_IS_ACTIVE(master_host) ||
SERVER_IS_DOWN(master_host->server)))
{ {
MXS_ERROR("Couldn't find suitable Master from %d candidates.", router_nservers); MXS_ERROR("Couldn't find suitable Master from %d candidates.", router_nservers);
return false; return false;
@ -147,7 +148,9 @@ bool select_connect_backend_servers(backend_ref_t **p_master_ref,
{ {
SERVER *serv = backend_ref[i].ref->server; SERVER *serv = backend_ref[i].ref->server;
if (!BREF_HAS_FAILED(&backend_ref[i]) && SERVER_IS_RUNNING(serv)) if (!BREF_HAS_FAILED(&backend_ref[i]) &&
SERVER_REF_IS_ACTIVE(backend_ref[i].ref) &&
SERVER_IS_RUNNING(serv))
{ {
/* check also for relay servers and don't take the master_host */ /* check also for relay servers and don't take the master_host */
if (slaves_found < max_nslaves && if (slaves_found < max_nslaves &&