From: Willy Tarreau <w@1wt.eu>
Date: Mon, 25 Jul 2011 06:30:51 +0000 (+0200)
Subject: [MINOR] proxy: make session rate-limit more accurate
X-Git-Tag: v1.5-dev8~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d408bd40f3f4f2886487466c48cef9c0f18cb857;p=thirdparty%2Fhaproxy.git

[MINOR] proxy: make session rate-limit more accurate

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.
---

diff --git a/src/proxy.c b/src/proxy.c
index a6c304f3e0..bd639fa413 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -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