MINOR: server: use functions to detect state changes and to update them
Detecting that a server's status has changed is a bit messy, as well
as it is to commit the status changes. We'll have to add new conditions
soon and we'd better avoid to multiply the number of touched locations
with the high risk of forgetting them.
This commit introduces :
- srv_lb_status_changed() to report if the status changed from the
previously committed one ;
- svr_lb_commit_status() to commit the current status
The function is now used by all load-balancing algorithms.
diff --git a/src/lb_chash.c b/src/lb_chash.c
index 41e06c7..fb10c72 100644
--- a/src/lb_chash.c
+++ b/src/lb_chash.c
@@ -98,8 +98,7 @@
{
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (srv_is_usable(srv->state, srv->eweight))
@@ -136,8 +135,7 @@
/* check/update tot_used, tot_weight */
update_backend_weight(p);
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function updates the server trees according to server <srv>'s new
@@ -151,8 +149,7 @@
{
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (!srv_is_usable(srv->state, srv->eweight))
@@ -194,8 +191,7 @@
/* check/update tot_used, tot_weight */
update_backend_weight(p);
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function must be called after an update to server <srv>'s effective
@@ -206,8 +202,7 @@
int old_state, new_state;
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
/* If changing the server's weight changes its state, we simply apply
@@ -222,8 +217,7 @@
new_state = srv_is_usable(srv->state, srv->eweight);
if (!old_state && !new_state) {
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
return;
}
else if (!old_state && new_state) {
@@ -244,8 +238,7 @@
p->lbprm.tot_wact += srv->eweight - srv->prev_eweight;
update_backend_weight(p);
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/*
@@ -383,8 +376,7 @@
p->lbprm.wdiv = BE_WEIGHT_SCALE;
for (srv = p->srv; srv; srv = srv->next) {
srv->eweight = (srv->uweight * p->lbprm.wdiv + p->lbprm.wmult - 1) / p->lbprm.wmult;
- srv->prev_eweight = srv->eweight;
- srv->prev_state = srv->state;
+ srv_lb_commit_status(srv);
}
recount_servers(p);
diff --git a/src/lb_fas.c b/src/lb_fas.c
index b4cfc79..b8b0569 100644
--- a/src/lb_fas.c
+++ b/src/lb_fas.c
@@ -77,8 +77,7 @@
{
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (srv_is_usable(srv->state, srv->eweight))
@@ -116,8 +115,7 @@
/* check/update tot_used, tot_weight */
update_backend_weight(p);
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function updates the server trees according to server <srv>'s new
@@ -131,8 +129,7 @@
{
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (!srv_is_usable(srv->state, srv->eweight))
@@ -176,8 +173,7 @@
/* check/update tot_used, tot_weight */
update_backend_weight(p);
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function must be called after an update to server <srv>'s effective
@@ -188,8 +184,7 @@
int old_state, new_state;
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
/* If changing the server's weight changes its state, we simply apply
@@ -204,8 +199,7 @@
new_state = srv_is_usable(srv->state, srv->eweight);
if (!old_state && !new_state) {
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
return;
}
else if (!old_state && new_state) {
@@ -231,8 +225,7 @@
fas_queue_srv(srv);
update_backend_weight(p);
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function is responsible for building the trees in case of fast
@@ -253,8 +246,7 @@
p->lbprm.wdiv = BE_WEIGHT_SCALE;
for (srv = p->srv; srv; srv = srv->next) {
srv->eweight = (srv->uweight * p->lbprm.wdiv + p->lbprm.wmult - 1) / p->lbprm.wmult;
- srv->prev_eweight = srv->eweight;
- srv->prev_state = srv->state;
+ srv_lb_commit_status(srv);
}
recount_servers(p);
diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c
index de1896e..ca68a33 100644
--- a/src/lb_fwlc.c
+++ b/src/lb_fwlc.c
@@ -69,8 +69,7 @@
{
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (srv_is_usable(srv->state, srv->eweight))
@@ -108,8 +107,7 @@
/* check/update tot_used, tot_weight */
update_backend_weight(p);
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function updates the server trees according to server <srv>'s new
@@ -123,8 +121,7 @@
{
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (!srv_is_usable(srv->state, srv->eweight))
@@ -168,8 +165,7 @@
/* check/update tot_used, tot_weight */
update_backend_weight(p);
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function must be called after an update to server <srv>'s effective
@@ -180,8 +176,7 @@
int old_state, new_state;
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
/* If changing the server's weight changes its state, we simply apply
@@ -196,8 +191,7 @@
new_state = srv_is_usable(srv->state, srv->eweight);
if (!old_state && !new_state) {
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
return;
}
else if (!old_state && new_state) {
@@ -223,8 +217,7 @@
fwlc_queue_srv(srv);
update_backend_weight(p);
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function is responsible for building the trees in case of fast
@@ -245,8 +238,7 @@
p->lbprm.wdiv = BE_WEIGHT_SCALE;
for (srv = p->srv; srv; srv = srv->next) {
srv->eweight = (srv->uweight * p->lbprm.wdiv + p->lbprm.wmult - 1) / p->lbprm.wmult;
- srv->prev_eweight = srv->eweight;
- srv->prev_state = srv->state;
+ srv_lb_commit_status(srv);
}
recount_servers(p);
diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index 7cf0cc7..b8756b6 100644
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -39,8 +39,7 @@
struct proxy *p = srv->proxy;
struct fwrr_group *grp;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (srv_is_usable(srv->state, srv->eweight))
@@ -81,8 +80,7 @@
/* check/update tot_used, tot_weight */
update_backend_weight(p);
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function updates the server trees according to server <srv>'s new
@@ -97,8 +95,7 @@
struct proxy *p = srv->proxy;
struct fwrr_group *grp;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (!srv_is_usable(srv->state, srv->eweight))
@@ -145,8 +142,7 @@
/* check/update tot_used, tot_weight */
update_backend_weight(p);
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function must be called after an update to server <srv>'s effective
@@ -158,8 +154,7 @@
struct proxy *p = srv->proxy;
struct fwrr_group *grp;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
/* If changing the server's weight changes its state, we simply apply
@@ -174,8 +169,7 @@
new_state = srv_is_usable(srv->state, srv->eweight);
if (!old_state && !new_state) {
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
return;
}
else if (!old_state && new_state) {
@@ -233,8 +227,7 @@
}
update_backend_weight(p);
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* Remove a server from a tree. It must have previously been dequeued. This
@@ -273,8 +266,7 @@
p->lbprm.wdiv = BE_WEIGHT_SCALE;
for (srv = p->srv; srv; srv = srv->next) {
srv->eweight = (srv->uweight * p->lbprm.wdiv + p->lbprm.wmult - 1) / p->lbprm.wmult;
- srv->prev_eweight = srv->eweight;
- srv->prev_state = srv->state;
+ srv_lb_commit_status(srv);
}
recount_servers(p);
diff --git a/src/lb_map.c b/src/lb_map.c
index 7ecd003..2d296d7 100644
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -28,8 +28,7 @@
{
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (srv_is_usable(srv->state, srv->eweight))
@@ -40,8 +39,7 @@
update_backend_weight(p);
p->lbprm.map.state |= LB_MAP_RECALC;
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function updates the map according to server <srv>'s new state */
@@ -49,8 +47,7 @@
{
struct proxy *p = srv->proxy;
- if (srv->state == srv->prev_state &&
- srv->eweight == srv->prev_eweight)
+ if (!srv_lb_status_changed(srv))
return;
if (!srv_is_usable(srv->state, srv->eweight))
@@ -61,8 +58,7 @@
update_backend_weight(p);
p->lbprm.map.state |= LB_MAP_RECALC;
out_update_state:
- srv->prev_state = srv->state;
- srv->prev_eweight = srv->eweight;
+ srv_lb_commit_status(srv);
}
/* This function recomputes the server map for proxy px. It relies on
@@ -181,8 +177,8 @@
act = bck = 0;
for (srv = p->srv; srv; srv = srv->next) {
srv->eweight = (srv->uweight * p->lbprm.wdiv + p->lbprm.wmult - 1) / p->lbprm.wmult;
- srv->prev_eweight = srv->eweight;
- srv->prev_state = srv->state;
+ srv_lb_commit_status(srv);
+
if (srv->state & SRV_BACKUP)
bck += srv->eweight;
else
diff --git a/src/server.c b/src/server.c
index a903e84..e0b200d 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1143,7 +1143,7 @@
else
curproxy->srv_act++;
- newsrv->prev_state = newsrv->state;
+ srv_lb_commit_status(newsrv);
}
}
return 0;