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

Merge branch 'release-1.0beta-refresh' of https://github.com/skysql/MaxScale into release-1.0beta-refresh

Browse Source
This commit is contained in:
VilhoRaatikka
2014-09-15 19:11:39 +03:00
parent a41a8d6060 dc6db1d3d4
commit 213a2dba9e
16 changed files with 64 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/routing/.gitignore vendored
View File

@ -1,3 +0,0 @@
*.o
*.so
depend.mk

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

@ -264,11 +264,11 @@ char *weightby;
{
for (n = 0; inst->servers[n]; n++)
{
int perc;
int perc, wght;
backend = inst->servers[n];
perc = (atoi(serverGetParameter(backend->server,
weightby)) * 1000) / total;
if (perc == 0)
perc = ((wght = atoi(serverGetParameter(backend->server,
weightby))) * 1000) / total;
if (perc == 0 && wght != 0)
perc = 1;
backend->weight = perc;
if (perc == 0)
@ -279,7 +279,7 @@ char *weightby;
"for weighting parameter '%s', "
"no queries will be routed to "
"this server.\n",
server->unique_name,
inst->servers[n]->server->unique_name,
weightby)));
}
@ -418,6 +418,9 @@ BACKEND *master_host = NULL;
if (SERVER_IN_MAINT(inst->servers[i]->server))
continue;
if (inst->servers[i]->weight == 0)
continue;
/* Check server status bits against bitvalue from router_options */
if (inst->servers[i] &&
SERVER_IS_RUNNING(inst->servers[i]->server) &&

3
server/modules/routing/readwritesplit/.gitignore vendored
View File

@ -1,3 +0,0 @@
*.o
*.so
depend.mk