From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Tue, 21 Nov 2023 12:19:12 +0000 (+0100)
Subject: MINOR: log/balance: set lbprm tot_weight on server on queue/dequeue
X-Git-Tag: v2.9-dev12~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20437b3e3230eb1545d5ce0467338606c1b2775d;p=thirdparty%2Fhaproxy.git

MINOR: log/balance: set lbprm tot_weight on server on queue/dequeue

Maintain proper px->lbprm.tot_weight for log backends. server's weight is
considered as 1 as long as the server is usable.

This will allow the stats page to correctly display the proxy status since
the check currently relies on proxy's lbprm.tot_weight variable.
---

diff --git a/src/log.c b/src/log.c
index c6222c5999..d77f462ee0 100644
--- a/src/log.c
+++ b/src/log.c
@@ -805,6 +805,8 @@ static void _log_backend_srv_queue(struct server *srv)
 	}
 	/* append the server to the list of available servers */
 	LIST_APPEND(&p->lbprm.log.avail, &srv->lb_list);
+
+	p->lbprm.tot_weight = (p->srv_act) ? p->srv_act : p->srv_bck;
 }
 
 static void log_backend_srv_up(struct server *srv)
@@ -859,6 +861,8 @@ static void _log_backend_srv_dequeue(struct server *srv)
 
 	/* reconstruct the array of usable servers */
 	_log_backend_srv_recalc(p);
+
+	p->lbprm.tot_weight = (p->srv_act) ? p->srv_act : p->srv_bck;
 }
 
 static void log_backend_srv_down(struct server *srv)