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

MXS-1363: Fix server selection algorithm in readconnroute

Browse Source 
Servers with zero weight are now considered as valid servers by the
readconnroute connection logic.
This commit is contained in:
Markus Mäkelä
2017-08-15 21:55:03 +03:00
parent af53c24106
commit 24a2393a31
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,7 +310,7 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session)
*/ */
for (SERVER_REF *ref = inst->service->dbref; ref; ref = ref->next) for (SERVER_REF *ref = inst->service->dbref; ref; ref = ref->next)
{ {
if (!SERVER_REF_IS_ACTIVE(ref) || SERVER_IN_MAINT(ref->server) || ref->weight == 0) if (!SERVER_REF_IS_ACTIVE(ref) || SERVER_IN_MAINT(ref->server))
{ {
continue; continue;
} }
@ -368,6 +368,10 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session)
{ {
candidate = ref; candidate = ref;
} }
else if (ref->weight == 0 || candidate->weight == 0)
{
candidate = ref->weight ? ref : candidate;
}
else if (((ref->connections + 1) * 1000) / ref->weight < else if (((ref->connections + 1) * 1000) / ref->weight <
((candidate->connections + 1) * 1000) / candidate->weight) ((candidate->connections + 1) * 1000) / candidate->weight)
{ {