From b2cd824a3d48fa279cd49d0ffd609a9f7a8f6e05 Mon Sep 17 00:00:00 2001 From: Aurelien DARRAGON Date: Thu, 2 Oct 2025 21:40:57 +0200 Subject: [PATCH] BUG/MINOR: sink: retry attempt for sft server may never occur Since 9561b9fb6 ("BUG/MINOR: sink: add tempo between 2 connection attempts for sft servers"), there is a possibility that the tempo we use to schedule the task expiry may point to TICK_ETERNITY as we add ticks to tempo with a simple addition that doesn't take care of potential wrapping. When this happens (although relatively rare, since now_ms only wraps every 49.7 days, but a forced wrap occurs 20 seconds after haproxy is started so it is more likely to happen there), the process_sink_forward() task expiry being set to TICK_ETERNITY, it may never be called again, this is especially true if the ring section only contains a single server. To fix the issue, we must use tick_add() helper function to set the tempo value and this way we ensure that the value will never be TICK_ETERNITY. It must be backported everywhere 9561b9fb6 was backported (up to 2.6 it seems). (cherry picked from commit c26ac3f5e44b78b7fc4caaaa6f8a8ea807178438) Signed-off-by: Aurelien DARRAGON (cherry picked from commit 27e59792c158aef7219194f43bc9e2d9d060b758) Signed-off-by: Aurelien DARRAGON (cherry picked from commit 0a1603052030876249140f2a92038f79611faa58) Signed-off-by: Aurelien DARRAGON --- src/sink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sink.c b/src/sink.c index ba2bdb9..972d6fc 100644 --- a/src/sink.c +++ b/src/sink.c @@ -604,7 +604,7 @@ static struct task *process_sink_forward(struct task * task, void *context, unsi * establishment attempt per second. */ if (!sft->appctx) { - uint tempo = sft->last_conn + MS_TO_TICKS(1000); + int tempo = tick_add(sft->last_conn, MS_TO_TICKS(1000)); if (sft->last_conn == TICK_ETERNITY || tick_is_expired(tempo, now_ms)) sft->appctx = sink_forward_session_create(sink, sft); -- 1.7.10.4