]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: stream: Remove BUG_ON about the task expiration in process_stream()
authorChristopher Faulet <cfaulet@haproxy.com>
Mon, 27 Feb 2023 15:13:33 +0000 (16:13 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Mon, 27 Feb 2023 16:45:45 +0000 (17:45 +0100)
At the end of process_stream(), A BUG_ON was recently added to abort if we
leave the function with an expired task. However, it may happen if an event
prevents the timeout to be handled but nothing evolved. In this case, the
task expiration is not updated and we expect to catch the timeout on the
immediate task wakeup.

No backport needed.

src/stream.c

index 28bb9866843f547795de36b44d2672fdb9af5b7e..4596fa6aab48a18d87da3135d862052abdb5729b 100644 (file)
@@ -2533,7 +2533,6 @@ struct task *process_stream(struct task *t, void *context, unsigned int state)
 
                t->expire = tick_first(t->expire, s->conn_exp);
 
-               BUG_ON(tick_is_expired(t->expire, now_ms));
 
                s->pending_events &= ~(TASK_WOKEN_TIMER | TASK_WOKEN_RES);
                stream_release_buffers(s);