Skip to content

Commit 2cf82ff

Browse files
Merge pull request #4957 from yue9944882/fix/extended-expbackoff-int-overflow
[extended] Fix int overflow in exponential backoff rate limiter
2 parents 8f624bf + b02272f commit 2cf82ff

2 files changed

Lines changed: 20 additions & 1 deletion

File tree

‎extended/src/main/java/io/kubernetes/client/extended/workqueue/ratelimiter/ItemExponentialFailureRateLimiter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public ItemExponentialFailureRateLimiter(Duration baseDelay, Duration maxDelay)
3737
public Duration when(T item) {
3838
long exp = failures.computeIfAbsent(item, k -> new AtomicLong()).getAndIncrement();
3939
long d = maxDelay.toMillis() >> exp;
40-
return d > baseDelay.toMillis() ? baseDelay.multipliedBy(1 << exp) : maxDelay;
40+
return d > baseDelay.toMillis() ? baseDelay.multipliedBy(1L << exp) : maxDelay;
4141
}
4242

4343
@Override

‎extended/src/test/java/io/kubernetes/client/extended/workqueue/ratelimiter/ItemExponentialFailureRateLimiterTest.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,23 @@ void negativeMaxDelay() {
9494
assertThat(rateLimiter.when("one")).isEqualTo(Duration.ofSeconds(-1000));
9595
assertThat(rateLimiter.when("one")).isEqualTo(Duration.ofSeconds(-1000));
9696
}
97+
98+
@Test
99+
void highFailureCountStaysPositive() {
100+
// maxDelay is large enough that the baseDelay*2^exp branch is still selected at exp == 31.
101+
// The multiplier must be computed in long arithmetic; an int shift (1 << 31) overflows to
102+
// Integer.MIN_VALUE and yields a negative backoff, which is never a valid delay.
103+
Duration baseDelay = Duration.ofMillis(1);
104+
Duration maxDelay = Duration.ofMillis(1L << 40);
105+
RateLimiter<String> rateLimiter = new ItemExponentialFailureRateLimiter<>(baseDelay, maxDelay);
106+
107+
// Advance to exp == 31 (the 32nd call returns the delay computed with exp == 31).
108+
for (int i = 0; i < 31; i++) {
109+
rateLimiter.when("item");
110+
}
111+
112+
Duration backoff = rateLimiter.when("item");
113+
assertThat(backoff).isPositive();
114+
assertThat(backoff).isEqualTo(baseDelay.multipliedBy(1L << 31));
115+
}
97116
}

0 commit comments

Comments
 (0)