RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG] do not dequeue requests on a dead server 

Kai Krueger reported a problem when a server goes down with active
connections. A lot of connections were drained by that server. Kai
did an amazing job at tracking this bug down to the dequeuing
mechanism which forgets to check the server state before allowing
a request to be sent to a server.

The problem occurs more often with long requests, which have a chance
to complete after the server is completely marked down, and to find
requests in the global queue which have not yet been fetched by other
servers.

The fix consists in ensuring that a server is up before sending it
any new request from the queue.
This commit is contained in:
Willy Tarreau 2008-11-30 21:51:58 +01:00
parent 304d6fb00f
commit 80b286a064
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/proto/queue.h
View File

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