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

MXS-1777 Changing server weights to match 2.2 behavior.

Browse Source 
Match 2.2, changed the weights back to non-inverse because 0-weight
is a special case. Renamed to server_weight for greppability.
This commit is contained in:
Niclas Antti
2018-09-24 12:05:47 +03:00
parent d0c5b2ff61
commit 7d231e5328
5 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/readwritesplit/rwsplit_select_backends.cc
View File

@ -79,7 +79,7 @@ SRWBackendVector::iterator best_score(SRWBackendVector& sBackends,
SRWBackendVector::iterator backend_cmp_router_conn(SRWBackendVector& sBackends)
{
static auto server_score = [](SERVER_REF* server) {
return server->inv_weight * server->connections;
return server->server_weight ? server->connections / server->server_weight : 0;
};
return best_score(sBackends, server_score);
@ -89,7 +89,7 @@ SRWBackendVector::iterator backend_cmp_router_conn(SRWBackendVector& sBackends)
SRWBackendVector::iterator backend_cmp_global_conn(SRWBackendVector& sBackends)
{
static auto server_score = [](SERVER_REF* server) {
return server->inv_weight * server->server->stats.n_current;
return server->server_weight ? server->server->stats.n_current / server->server_weight : 0;
};
return best_score(sBackends, server_score);
@ -99,7 +99,7 @@ SRWBackendVector::iterator backend_cmp_global_conn(SRWBackendVector& sBackends)
SRWBackendVector::iterator backend_cmp_behind_master(SRWBackendVector& sBackends)
{
static auto server_score = [](SERVER_REF* server) {
return server->inv_weight * server->server->rlag;
return server->server_weight ? server->server->rlag / server->server_weight : 0;
};
return best_score(sBackends, server_score);
@ -109,7 +109,7 @@ SRWBackendVector::iterator backend_cmp_behind_master(SRWBackendVector& sBackends
SRWBackendVector::iterator backend_cmp_current_load(SRWBackendVector& sBackends)
{
static auto server_score = [](SERVER_REF* server) {
return server->inv_weight * server->server->stats.n_current_ops;
return server->server_weight ? server->server->stats.n_current_ops / server->server_weight : 0;
};
return best_score(sBackends, server_score);