Skip to content

KAFKA-12879: Addendum to reduce flakiness of tests #11871

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

Merged
rhauch merged 1 commit into from
Mar 9, 2022
Merged

KAFKA-12879: Addendum to reduce flakiness of tests #11871

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
11 changes: 7 additions & 4 deletions connect/runtime/src/main/java/org/apache/kafka/connect/util/RetryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,13 @@ public static <T> T retryUntilTimeout(Callable<T> callable, Supplier<String> des
lastError = e;
}

long millisRemaining = Math.max(0, end - System.currentTimeMillis());
if (millisRemaining < retryBackoffMs) {
// exit when the time remaining is less than retryBackoffMs
break;
if (retryBackoffMs > 0) {
long millisRemaining = Math.max(0, end - System.currentTimeMillis());
if (millisRemaining < retryBackoffMs) {
// exit when the time remaining is less than retryBackoffMs
break;
}
Utils.sleep(retryBackoffMs);
}
Utils.sleep(retryBackoffMs);
} while (System.currentTimeMillis() < end);
Expand Down
10 changes: 6 additions & 4 deletions connect/runtime/src/test/java/org/apache/kafka/connect/util/RetryUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
@RunWith(PowerMockRunner.class)
public class RetryUtilTest {

private static final Duration TIMEOUT = Duration.ofSeconds(10);

private Callable<String> mockCallable;
private final Supplier<String> testMsg = () -> "Test";

Expand Down Expand Up @@ -69,7 +71,7 @@ public void retriesEventuallySucceed() throws Exception {
.thenThrow(new TimeoutException())
.thenReturn("success");

assertEquals("success", RetryUtil.retryUntilTimeout(mockCallable, testMsg, Duration.ofMillis(100), 1));
assertEquals("success", RetryUtil.retryUntilTimeout(mockCallable, testMsg, TIMEOUT, 1));
Mockito.verify(mockCallable, Mockito.times(4)).call();
}

Expand All @@ -83,7 +85,7 @@ public void failWithNonRetriableException() throws Exception {
.thenThrow(new TimeoutException("timeout"))
.thenThrow(new NullPointerException("Non retriable"));
NullPointerException e = assertThrows(NullPointerException.class,
() -> RetryUtil.retryUntilTimeout(mockCallable, testMsg, Duration.ofMillis(100), 0));
() -> RetryUtil.retryUntilTimeout(mockCallable, testMsg, TIMEOUT, 0));
assertEquals("Non retriable", e.getMessage());
Mockito.verify(mockCallable, Mockito.times(6)).call();
}
Expand Down Expand Up @@ -114,7 +116,7 @@ public void testNoBackoffTimeAndSucceed() throws Exception {
.thenThrow(new TimeoutException())
.thenReturn("success");

assertEquals("success", RetryUtil.retryUntilTimeout(mockCallable, testMsg, Duration.ofMillis(50), 0));
assertEquals("success", RetryUtil.retryUntilTimeout(mockCallable, testMsg, TIMEOUT, 0));
Mockito.verify(mockCallable, Mockito.times(4)).call();
}

Expand Down Expand Up @@ -151,7 +153,7 @@ public void testInvalidRetryTimeout() throws Exception {
Mockito.when(mockCallable.call())
.thenThrow(new TimeoutException("timeout"))
.thenReturn("success");
assertEquals("success", RetryUtil.retryUntilTimeout(mockCallable, testMsg, Duration.ofMillis(100), -1));
assertEquals("success", RetryUtil.retryUntilTimeout(mockCallable, testMsg, TIMEOUT, -1));
Mockito.verify(mockCallable, Mockito.times(2)).call();
}

Expand Down