RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-21 21:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "MINOR: queue: update proxy->served once out of the loop"

Browse Source 
This reverts commit 3e92a31783b545dd58c4be6c588808763e0042bc.

The recent changes since 5304669e1 MEDIUM: queue: make
pendconn_process_next_strm() only return the pendconn opened a tiny race
condition between stream_free() and process_srv_queue(), as the pendconn
is accessed outside of the lock, possibly while it's being freed. A
different approach is required.
This commit is contained in:
Willy Tarreau 2021-06-24 07:26:59 +02:00
parent e76fc3253d
commit d83c98eb14
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

@ -351,9 +351,10 @@ void process_srv_queue(struct server *s, int server_locked)
if (!pc)
break;
done++;
done = 1;
_HA_ATOMIC_INC(&s->served);
_HA_ATOMIC_INC(&p->served);
stream_add_srv_conn(pc->strm, s);
task_wakeup(pc->strm->task, TASK_WOKEN_RES);
@ -362,8 +363,6 @@ void process_srv_queue(struct server *s, int server_locked)
if (!server_locked)
HA_SPIN_UNLOCK(SERVER_LOCK, &s->lock);
_HA_ATOMIC_ADD(&p->served, done);
if (done && p->lbprm.server_take_conn)
p->lbprm.server_take_conn(s);
}