mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-13 00:39:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] do not dequeue the backend's pending connections on a dead server

Browse Source 
Kai Krueger found that previous patch was incomplete, because there is
an unconditionnal call to process_srv_queue() in session_free() which
still causes a dead server to consume pending connections from the
backend.

This call was made unconditionnal so that we don't leave unserved
connections in the server queue, for instance connections coming
in with "option persist" which can bypass the server status check.
However, the server must not touch the backend's queue if it is down.

Another fear was that some connections might remain unserved when
the server is using a dynamic maxconn if the number of connections
to the backend is too low. Right now, srv_dynamic_maxconn() ensures
this cannot happen, so the call can remain conditionnal.

The fix consists in allowing a server to process it own queue whatever
its state, but not to touch the backend's queue if it is down. Its
queue should normally be empty when the server is down because it is
redistributed when the server goes down. The only remaining cases are
precisely the persistent connections with "option persist" set, coming
in after the queue has been redispatched. Those ones must still be
processed when a connection terminates.
This commit is contained in:
Willy Tarreau
2008-12-04 09:33:58 +01:00
parent 80b286a064
commit cd485c4480
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/proto/queue.h
View File

@@ -64,11 +64,11 @@ static inline struct pendconn *pendconn_from_px(const struct proxy *px) {
}
/* returns 0 if nothing has to be done for server <s> regarding queued connections,
* and non-zero otherwise. If the server is down, we always return zero. Suited for
* and if/else usage.
* and non-zero otherwise. If the server is down, we only check its own queue. Suited
* for and if/else usage.
*/
static inline int may_dequeue_tasks(const struct server *s, const struct proxy *p) {
return (s && (s->state & SRV_RUNNING) && (s->nbpend || p->nbpend) &&
return (s && (s->nbpend || (p->nbpend && (s->state & SRV_RUNNING))) &&
(!s->maxconn || s->cur_sess < srv_dynamic_maxconn(s)));
}