fix no rate limiting if average is 0
This commit is contained in:
parent
e1e86763e3
commit
0861c47e54
2 changed files with 18 additions and 7 deletions
|
@ -79,10 +79,12 @@ func New(ctx context.Context, next http.Handler, config dynamic.RateLimit, name
|
|||
period = time.Second
|
||||
}
|
||||
|
||||
// if config.Average == 0, in that case,
|
||||
// the value of maxDelay does not matter since the reservation will (buggily) give us a delay of 0 anyway.
|
||||
// Initialized at rate.Inf to enforce no rate limiting when config.Average == 0
|
||||
rtl := float64(rate.Inf)
|
||||
// No need to set any particular value for maxDelay as the reservation's delay
|
||||
// will be <= 0 in the Inf case (i.e. the average == 0 case).
|
||||
var maxDelay time.Duration
|
||||
var rtl float64
|
||||
|
||||
if config.Average > 0 {
|
||||
rtl = float64(config.Average*int64(time.Second)) / float64(period)
|
||||
// maxDelay does not scale well for rates below 1,
|
||||
|
@ -153,10 +155,6 @@ func (rl *rateLimiter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||
return
|
||||
}
|
||||
|
||||
// time/rate is bugged, since a rate.Limiter with a 0 Limit not only allows a Reservation to take place,
|
||||
// but also gives a 0 delay below (because of a division by zero, followed by a multiplication that flips into the negatives),
|
||||
// regardless of the current load.
|
||||
// However, for now we take advantage of this behavior to provide the no-limit ratelimiter when config.Average is 0.
|
||||
res := bucket.Reserve()
|
||||
if !res.OK() {
|
||||
http.Error(w, "No bursty traffic allowed", http.StatusTooManyRequests)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue