Skip to content

fix(retry): preserve sub-second retry delays #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maxlambrecht wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(retry): preserve sub-second retry delays #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion java-spiffe-core/src/main/java/io/spiffe/workloadapi/retry/RetryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void scheduleRetry(final Runnable runnable) {
if (exponentialBackoffPolicy.reachedMaxRetries(retryCount)) {
return;
}
executor.schedule(runnable, nextDelay.getSeconds(), TimeUnit.SECONDS);
executor.schedule(runnable, nextDelay.toMillis(), TimeUnit.MILLISECONDS);
nextDelay = exponentialBackoffPolicy.nextDelay(nextDelay);
retryCount++;
}
Expand Down
29 changes: 22 additions & 7 deletions java-spiffe-core/src/test/java/io/spiffe/workloadapi/retry/RetryHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,38 @@ void testScheduleRetry_defaultPolicy() {

retryHandler.scheduleRetry(runnable);

verify(scheduledExecutorService).schedule(runnable, 1, TimeUnit.SECONDS);
verify(scheduledExecutorService).schedule(runnable, 1000, TimeUnit.MILLISECONDS);
assertEquals(1, retryHandler.getRetryCount());

// second retry
retryHandler.scheduleRetry(runnable);
assertEquals(2, retryHandler.getRetryCount());
verify(scheduledExecutorService).schedule(runnable, 2, TimeUnit.SECONDS);
verify(scheduledExecutorService).schedule(runnable, 2000, TimeUnit.MILLISECONDS);

// third retry
retryHandler.scheduleRetry(runnable);
assertEquals(3, retryHandler.getRetryCount());
verify(scheduledExecutorService).schedule(runnable, 4, TimeUnit.SECONDS);
verify(scheduledExecutorService).schedule(runnable, 4000, TimeUnit.MILLISECONDS);

// fourth retry
retryHandler.scheduleRetry(runnable);
assertEquals(4, retryHandler.getRetryCount());
verify(scheduledExecutorService).schedule(runnable, 8, TimeUnit.SECONDS);
verify(scheduledExecutorService).schedule(runnable, 8000, TimeUnit.MILLISECONDS);
}

@Test
void testScheduleRetry_subSecondDelay_usesMilliseconds() {
Runnable runnable = () -> { };
ExponentialBackoffPolicy exponentialBackoffPolicy = ExponentialBackoffPolicy.builder()
.initialDelay(Duration.ofMillis(250))
.build();

RetryHandler retryHandler = new RetryHandler(exponentialBackoffPolicy, scheduledExecutorService);

retryHandler.scheduleRetry(runnable);

verify(scheduledExecutorService).schedule(runnable, 250, TimeUnit.MILLISECONDS);
assertEquals(1, retryHandler.getRetryCount());
}

@Test
Expand All @@ -60,18 +75,18 @@ void testScheduleRetry_maxRetries() {

retryHandler.scheduleRetry(runnable);

verify(scheduledExecutorService).schedule(runnable, 1, TimeUnit.SECONDS);
verify(scheduledExecutorService).schedule(runnable, 1000, TimeUnit.MILLISECONDS);
assertEquals(1, retryHandler.getRetryCount());

// second retry
retryHandler.scheduleRetry(runnable);
assertEquals(2, retryHandler.getRetryCount());
verify(scheduledExecutorService).schedule(runnable, 2, TimeUnit.SECONDS);
verify(scheduledExecutorService).schedule(runnable, 2000, TimeUnit.MILLISECONDS);

// third retry
retryHandler.scheduleRetry(runnable);
assertEquals(3, retryHandler.getRetryCount());
verify(scheduledExecutorService).schedule(runnable, 4, TimeUnit.SECONDS);
verify(scheduledExecutorService).schedule(runnable, 4000, TimeUnit.MILLISECONDS);

Mockito.reset(scheduledExecutorService);

Expand Down