From: Olivier Houchard Date: Fri, 13 Dec 2024 17:11:05 +0000 (+0000) Subject: BUG/MEDIUM: queues: Make sure we call process_srv_queue() when leaving X-Git-Tag: v3.2-dev2~65 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9ce9c26469e00ab71fe6387dbd13010d4930f0;p=thirdparty%2Fhaproxy.git BUG/MEDIUM: queues: Make sure we call process_srv_queue() when leaving In stream_free(), make sure we call process_srv_queue() each time we call sess_change_server(), otherwise a server may end up not dequeuing any stream when it could do so. In some extreme cases it could lead to an infinite loop, as the server would appear to be available, as its "served" parameter would be < maxconn, but would end up not being used, as there are elements still in its queue. This should be backported up to 2.6. --- diff --git a/src/stream.c b/src/stream.c index 6e6a54555a..73c182b686 100644 --- a/src/stream.c +++ b/src/stream.c @@ -628,11 +628,14 @@ void stream_free(struct stream *s) } if (unlikely(s->srv_conn)) { + struct server *oldsrv = s->srv_conn; /* the stream still has a reserved slot on a server, but * it should normally be only the same as the one above, * so this should not happen in fact. */ sess_change_server(s, NULL); + if (may_dequeue_tasks(oldsrv, s->be)) + process_srv_queue(oldsrv); } /* We may still be present in the buffer wait queue */