Merge pull request ReactiveX#64 from resilience4j/uppetlimit-for-sema…

…phore-based-limiter Issue ReactiveX#63 upper limit for SemaphoreBasedRateLimiter
jihoonson · Mar 24, 2017 · 256f89a · 256f89a
2 parents accd424 + 9d8d841
commit 256f89a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.../src/main/java/io/github/resilience4j/ratelimiter/internal/SemaphoreBasedRateLimiter.java b/.../src/main/java/io/github/resilience4j/ratelimiter/internal/SemaphoreBasedRateLimiter.java
@@ -105,7 +105,8 @@ private void scheduleLimitRefresh() {
     }
 
     void refreshLimit() {
-        semaphore.release(this.rateLimiterConfig.getLimitForPeriod());
+        int permissionsToRelease = this.rateLimiterConfig.getLimitForPeriod() - semaphore.availablePermits();
+        semaphore.release(permissionsToRelease);
     }
 
     /**

diff --git a/...t/java/io/github/resilience4j/ratelimiter/internal/SemaphoreBasedRateLimiterImplTest.java b/...t/java/io/github/resilience4j/ratelimiter/internal/SemaphoreBasedRateLimiterImplTest.java
@@ -215,6 +215,16 @@ public void getRateLimiterConfig() throws Exception {
         then(limit.getRateLimiterConfig()).isEqualTo(config);
     }
 
+    @Test
+    public void isUpperLimitedForPermissions() throws Exception {
+        ScheduledExecutorService scheduler = mock(ScheduledExecutorService.class);
+        SemaphoreBasedRateLimiter limit = new SemaphoreBasedRateLimiter("test", config, scheduler);
+        RateLimiter.Metrics metrics = limit.getMetrics();
+        then(metrics.getAvailablePermissions()).isEqualTo(2);
+        limit.refreshLimit();
+        then(metrics.getAvailablePermissions()).isEqualTo(2);
+    }
+
     @Test
     public void getDetailedMetrics() throws Exception {
         ScheduledExecutorService scheduler = mock(ScheduledExecutorService.class);