]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[MINOR] proxy: make session rate-limit more accurate
authorWilly Tarreau <w@1wt.eu>
Mon, 25 Jul 2011 06:30:51 +0000 (08:30 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 25 Jul 2011 06:30:51 +0000 (08:30 +0200)
Patch d9bbe17b used to limit the rate-limit to off-by-one to avoid
a busy loop when the limit is reached. Now that the listeners are
automatically disabled and queued when a limit is reached, we don't
need this workaround anymore and can bring back the most accurate
computation.

src/proxy.c

index a6c304f3e0af6cfe664cdc0f82bd18238855e312..bd639fa4136ed70bf8dfa577b607c19773bcca51 100644 (file)
@@ -501,7 +501,7 @@ void maintain_proxies(int *next)
                                p->state = PR_STREADY;
 
                        if (p->fe_sps_lim &&
-                           (wait = next_event_delay(&p->fe_sess_per_sec, p->fe_sps_lim, 1))) {
+                           (wait = next_event_delay(&p->fe_sess_per_sec, p->fe_sps_lim, 0))) {
                                /* we're blocking because a limit was reached on the number of
                                 * requests/s on the frontend. We want to re-check ASAP, which
                                 * means in 1 ms before estimated expiration date, because the