Fixed - RRateLimiter allows limit overcome. #3639

4 years ago · f51d519129
parent 4c98333dff
commit f51d519129
1 changed files with 5 additions and 1 deletions
--- a/redisson/src/main/java/org/redisson/RedissonRateLimiter.java
+++ b/redisson/src/main/java/org/redisson/RedissonRateLimiter.java
@ -206,7 +206,11 @@ public class RedissonRateLimiter extends RedissonExpirable implements RRateLimit

                     + "if released > 0 then "
                          + "redis.call('zremrangebyscore', permitsName, 0, tonumber(ARGV[2]) - interval); "
-                          + "currentValue = tonumber(currentValue) + released; "
+                          + "if tonumber(currentValue) + released > tonumber(rate) then "
+                               + "currentValue = tonumber(rate) - redis.call('zcard', permitsName); "
+                          + "else "
+                               + "currentValue = tonumber(currentValue) + released; "
+                          + "end; "
                          + "redis.call('set', valueName, currentValue);"
                     + "end;"