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

Traffic is routed to the master if no slaves available

Browse Source 
Traffic is routed to the master if no slaves available, this applies
for router_options=slave in config file
This commit is contained in:
MassimilianoPinto
2014-02-20 13:26:16 +01:00
parent dd5c287339
commit fa14dceb4b
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server/modules/routing/readconnroute.c
View File

@ -283,6 +283,7 @@ ROUTER_INSTANCE *inst = (ROUTER_INSTANCE *)instance;
ROUTER_CLIENT_SES *client_rses; ROUTER_CLIENT_SES *client_rses;
BACKEND *candidate = NULL; BACKEND *candidate = NULL;
int i; int i;
int master_host = -1;
LOGIF(LD, (skygw_log_write_flush( LOGIF(LD, (skygw_log_write_flush(
LOGFILE_DEBUG, LOGFILE_DEBUG,
@ -336,6 +337,16 @@ int i;
inst->bitmask))); inst->bitmask)));
} }
/*
* If router_options=slave, get the running master
* It will be used if there arw no running slaves at all
*/
if (inst->bitvalue == SERVER_SLAVE) {
if (master_host < 0 && (SERVER_IS_MASTER(inst->servers[i]->server))) {
master_host = i;
}
}
if (inst->servers[i] && if (inst->servers[i] &&
SERVER_IS_RUNNING(inst->servers[i]->server) && SERVER_IS_RUNNING(inst->servers[i]->server) &&
(inst->servers[i]->server->status & inst->bitmask) == (inst->servers[i]->server->status & inst->bitmask) ==
@ -368,15 +379,22 @@ int i;
} }
} }
/* no candidate server here, clean and return NULL */ /* The are no candidate server here!
* With router_option=slave a master_host could be set, so route traffic there.
* Otherwise, just clean up and return NULL
*/
if (!candidate) { if (!candidate) {
LOGIF(LE, (skygw_log_write_flush( if (master_host >= 0) {
LOGFILE_ERROR, candidate = inst->servers[master_host];
"Error : Failed to create new routing session. " } else {
"Couldn't find eligible candidate server. Freeing " LOGIF(LE, (skygw_log_write_flush(
"allocated resources."))); LOGFILE_ERROR,
free(client_rses); "Error : Failed to create new routing session. "
return NULL; "Couldn't find eligible candidate server. Freeing "
"allocated resources.")));
free(client_rses);
return NULL;
}
} }
/* /*