RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-06 03:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MAJOR: queue/threads: make pendconn_redistribute not lock the server

Browse Source 
Since commit 3ff577e ("MAJOR: server: make server state changes
synchronous again"), srv_update_status() is called with the server
lock held. It calls (among others) pendconn_redistribute() which used
to take this lock, causing CPU loops by default, or crashes if build
with -DDEBUG_THREAD. Since this function is not called from any other
place anymore, it doesn't require the lock on its own so let's simply
drop it from there.

No backport is needed, this is 1.9-specific.
This commit is contained in:
Willy Tarreau 2018-08-21 18:11:03 +02:00
parent 80c56790d9
commit deca26c452
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/queue.c
View File

@ -395,7 +395,8 @@ struct pendconn *pendconn_add(struct stream *strm)
}
/* Redistribute pending connections when a server goes down. The number of
* connections redistributed is returned.
* connections redistributed is returned. It must be called with the server
* lock held.
*/
int pendconn_redistribute(struct server *s)
{
@ -408,7 +409,6 @@ int pendconn_redistribute(struct server *s)
if ((s->proxy->options & (PR_O_REDISP|PR_O_PERSIST)) != PR_O_REDISP)
return 0;
HA_SPIN_LOCK(SERVER_LOCK, &s->lock);
for (node = eb32_first(&s->pendconns); node; node = eb32_next(node)) {
p = eb32_entry(&node, struct pendconn, node);
if (p->strm_flags & SF_FORCE_PRST)
@ -420,7 +420,6 @@ int pendconn_redistribute(struct server *s)
task_wakeup(p->strm->task, TASK_WOKEN_RES);
}
HA_SPIN_UNLOCK(SERVER_LOCK, &s->lock);
return xferred;
}