mirror of
https://github.com/haproxy/haproxy.git
synced 2026-07-13 19:13:46 -04:00
BUG/MINOR: haload: fix spurious task wakeup in hld_strm_task()
When a stream is freed, hld_strm_task() was unconditionally re-queuing the user task, even when no streams were left or when no update was needed. This caused spurious task wakeups, which could incorrectly inflate connection and request rate counters to come for the -R option implementation. Only queue the user task if there are remaining streams to process, and properly update the expiration time. No need to backport. haload arrived with this current version.
This commit is contained in:
parent
b81e271567
commit
1e1e780b79
1 changed files with 11 additions and 0 deletions
11
src/haload.c
11
src/haload.c
|
|
@ -1265,6 +1265,17 @@ struct task *hld_strm_task(struct task *t, void *context, unsigned int state)
|
|||
hldstream_free(&hs);
|
||||
t = NULL;
|
||||
|
||||
if (LIST_ISEMPTY(&usr->strms))
|
||||
usr->task->expire = TICK_ETERNITY;
|
||||
else {
|
||||
/* Update the user task expiration from the first stream which
|
||||
* is also the stream with the oldest expiration time.
|
||||
*/
|
||||
first_hs = LIST_ELEM(usr->strms.n, struct hldstream *, list);
|
||||
hs->usr->task->expire = first_hs->expire;
|
||||
task_queue(hs->usr->task);
|
||||
}
|
||||
|
||||
goto leave;
|
||||
err:
|
||||
TRACE_DEVEL("leaving on error", HLD_STRM_EV_TASK, hs);
|
||||
|
|
|
|||
Loading…
Reference in a new issue