mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: stream: flag TASK_WOKEN_RES not set if task in runqueue

Browse Source 
Under certain circumstances, if a stream's task is first woken up
(eg: I/O event) then notified of the availability of a buffer it
was waiting for via stream_res_wakeup(), this second event is lost
because the flags are only merged after seeing that the task is
running. At the moment it seems that the TASK_WOKEN_RES event is
not explicitly checked for, but better fix this before getting
reports of lost events.

This fix removes this "task running" test which is properly
performed in task_wakeup(), while the flags are properly merged.

It must be backported to 1.7 and 1.6.
This commit is contained in:
Emeric Brun 2017-03-31 12:04:09 +02:00 committed by Willy Tarreau
parent 1af20c7161
commit ff4491726f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/stream.h
View File

@ -286,7 +286,7 @@ static void inline stream_init_srv_conn(struct stream *sess)
* it returns 0. */
static int inline stream_res_wakeup(struct stream *s)
{
if (s->task->state & TASK_RUNNING || task_in_rq(s->task))
if (s->task->state & TASK_RUNNING)
return 0;
task_wakeup(s->task, TASK_WOKEN_RES);
return 1;