From: Olivier Houchard <ohouchard@haproxy.com>
Date: Fri, 7 Nov 2025 14:43:16 +0000 (+0000)
Subject: BUG/MEDIUM: stick-tables: Make sure updates are seen as local
X-Git-Tag: v3.3-dev12~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c26bcfc1e3ae0193e2589a15c96ffd44b2e0f770;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: stick-tables: Make sure updates are seen as local

In stktable_touch_with_exp, if it is a local update, add it to the
pending update list even if it's already in the tree as a remote update,
otherwise it will never be communicated to other peers;
It used to work before 3.2 because of the ordering of operations, but
it's been broken by adding an extra step with the pending update list,
so we now have to explicitely check for that.

This should be backported to 3.2.
---

diff --git a/src/stick_table.c b/src/stick_table.c
index 06a91ea49..c9faa56a8 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -638,7 +638,7 @@ void stktable_touch_with_exp(struct stktable *t, struct stksess *ts, int local,
 			/* Check if this entry is not in the tree or not
 			 * scheduled for at least one peer.
 			 */
-			if (!ts->upd.node.leaf_p || _HA_ATOMIC_LOAD(&ts->seen)) {
+			if (!ts->upd.node.leaf_p || _HA_ATOMIC_LOAD(&ts->seen) || !ts->updt_is_local) {
 				_HA_ATOMIC_STORE(&ts->updt_is_local, 1);
 				did_append = MT_LIST_TRY_APPEND(&t->pend_updts[tgid - 1], &ts->pend_updts);
 			}