Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,27 @@ public ItemExponentialFailureRateLimiter(Duration baseDelay, Duration maxDelay)
@Override
public Duration when(T item) {
long exp = failures.computeIfAbsent(item, k -> new AtomicLong()).getAndIncrement();
long d = maxDelay.toMillis() >> exp;
return d > baseDelay.toMillis() ? baseDelay.multipliedBy(1L << exp) : maxDelay;
if (baseDelay.isNegative() || maxDelay.isNegative()) {
// Preserve the existing behavior for negative duration configurations.
long d = maxDelay.toMillis() >> exp;
return d > baseDelay.toMillis() ? baseDelay.multipliedBy(1L << exp) : maxDelay;
}
if (baseDelay.compareTo(maxDelay) >= 0) {
return maxDelay;
}
if (baseDelay.isZero()) {
return baseDelay;
}
Duration delay = baseDelay;
Duration halfMaxDelay = maxDelay.dividedBy(2);
for (long i = 0; i < exp; i++) {
// Check before doubling to avoid overflow; positive durations reach the cap in at most 94 steps.
if (delay.compareTo(halfMaxDelay) > 0) {
return maxDelay;
}
delay = delay.multipliedBy(2);
}
return delay;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,46 @@
import static org.assertj.core.api.Assertions.assertThat;

import java.time.Duration;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

class ItemExponentialFailureRateLimiterTest {

static Stream<Arguments> positiveDelays() {
return Stream.of(
Arguments.of(Duration.ofMillis(5), Duration.ofSeconds(1000)),
Arguments.of(Duration.ofMillis(1), Duration.ofMillis(Long.MAX_VALUE)),
Arguments.of(Duration.ofSeconds(Long.MAX_VALUE / 4), Duration.ofSeconds(Long.MAX_VALUE)),
Arguments.of(Duration.ofNanos(1), Duration.ofSeconds(Long.MAX_VALUE, 999_999_999)),
Arguments.of(Duration.ofNanos(3), Duration.ofNanos(10)),
Arguments.of(Duration.ofSeconds(2), Duration.ofSeconds(1)),
Arguments.of(Duration.ofMillis(1), Duration.ZERO),
Arguments.of(Duration.ZERO, Duration.ofSeconds(1)));
}

@ParameterizedTest
@MethodSource("positiveDelays")
void repeatedFailuresStayCapped(Duration baseDelay, Duration maxDelay) {
RateLimiter<String> rateLimiter = new ItemExponentialFailureRateLimiter<>(baseDelay, maxDelay);
Duration expected = baseDelay.compareTo(maxDelay) < 0 ? baseDelay : maxDelay;

for (int call = 1; call <= 1024; call++) {
assertThat(rateLimiter.when("item")).as("call %s", call).isEqualTo(expected);
assertThat(rateLimiter.numRequeues("item")).isEqualTo(call);
expected =
expected.compareTo(maxDelay.minus(expected)) >= 0 ? maxDelay : expected.plus(expected);
}

rateLimiter.forget("item");
assertThat(rateLimiter.numRequeues("item")).isZero();
assertThat(rateLimiter.when("item"))
.isEqualTo(baseDelay.compareTo(maxDelay) < 0 ? baseDelay : maxDelay);
assertThat(rateLimiter.numRequeues("item")).isEqualTo(1);
}

@Test
void itemExponentialFailureRateLimiter() {
RateLimiter<String> rateLimiter =
Expand Down