Skip to content
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

Jump to bottom

[BUG] #15013 Fix retryInterval in RetryPolicy will never be used in RetryUtils #15014

Merged
merged 6 commits into from
Jan 25, 2024
Merged

[BUG] #15013 Fix retryInterval in RetryPolicy will never be used in RetryUtils #15014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f37b350
Update RetryUtils.java
zhihuasu1 Oct 11, 2023
9c36c40
UT
zhihuasu1 Oct 13, 2023
7333dd2
Update RetryUtilsTest.java
zhihuasu1 Oct 26, 2023
6e8ed88
Merge branch 'dev' into dev
zhihuasu1 Nov 8, 2023
634ea19
Merge branch 'dev' into dev
SbloodyS Nov 8, 2023
d524fac
Merge branch 'dev' into dev
rickchengx Jan 25, 2024
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 ...-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/RetryUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static <T> T retryFunction(@NonNull Supplier<T> supplier) {
*/
public static <T> T retryFunction(@NonNull Supplier<T> supplier, @NonNull RetryPolicy retryPolicy) {
int retryCount = 0;
long retryInterval = 0L;
long retryInterval = retryPolicy.getRetryInterval();
while (true) {
try {
return supplier.get();
Expand Down
7 changes: 7 additions & 0 deletions ...k-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/utils/RetryUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ public void retryFunction() {
Assertions.fail();
});

long startTime = System.currentTimeMillis();
Assertions.assertThrows(RuntimeException.class, () -> RetryUtils.retryFunction((Supplier<Boolean>) () -> {
throw new RuntimeException("Test failed function");
}, new RetryUtils.RetryPolicy(3, 1000L)));
long endTime = System.currentTimeMillis();
long elapsedTime = endTime - startTime;
Assertions.assertTrue(elapsedTime >= 3000L && elapsedTime < 4000L);
}

}
Loading