From: Olivier Houchard <ohouchard@haproxy.com>
Date: Wed, 15 Oct 2025 14:01:21 +0000 (+0200)
Subject: MEDIUM: stick-tables: Stop as soon as stktable_trash_oldest succeeds.
X-Git-Tag: v3.3-dev11~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd92aeb3661e2312aa604186f732cfe77d369ea0;p=thirdparty%2Fhaproxy.git

MEDIUM: stick-tables: Stop as soon as stktable_trash_oldest succeeds.

stktable_trash_oldest() goes through all the shards, trying to free a
number of entries. Going through each shard is expensive, as we have to
take the shard lock, so stop as soon as we free'd at least one entry, as
it is only called when we want to make room for one entry.
---

diff --git a/src/stick_table.c b/src/stick_table.c
index 2d889b48a..0d50a9d63 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -414,6 +414,14 @@ int stktable_trash_oldest(struct stktable *t)
 
 		HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &t->shards[shard].sh_lock);
 
+		/*
+		 * There is not much point in trying to purge more entries,
+		 * it will be as costly to acquire the lock for the next shard,
+		 * as it would be for the next session creation, so if we
+		 * managed to purge at least one entry, give up now.
+		 */
+		if (batched > 0)
+			break;
 		shard++;
 		if (shard >= CONFIG_HAP_TBL_BUCKETS)
 			shard = 0;