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

[#1727] Use default RetryOptions for LocalActivities when not set #2257

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[#1727] Use default RetryOptions for LocalActivities when not set #2257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8201f72
[#1727] Use default RetryOptions for LocalActivities when not set or …
ghaskins Oct 7, 2024
60124b2
Merge branch 'master' into issue-1727
ghaskins Oct 9, 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
20 changes: 10 additions & 10 deletions temporal-sdk/src/main/java/io/temporal/internal/worker/LocalActivityWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,14 @@ private void submitAttempt(
slotQueue.submitAttempt(reservationDat, isRetry, task);
}

private RetryOptions getRetryOptions(PollActivityTaskQueueResponseOrBuilder activityTask) {
if (isRetryPolicyNotSet(activityTask)) {
return RetryOptions.getDefaultInstance();
} else {
return RetryOptionsUtils.toRetryOptions(activityTask.getRetryPolicy());
}
}

/**
* @param executionContext execution context of the activity
* @param activityTask activity task
Expand Down Expand Up @@ -154,11 +162,7 @@ private RetryDecision shouldRetry(
throw (Error) attemptThrowable;
}

if (isRetryPolicyNotSet(activityTask)) {
return new RetryDecision(RetryState.RETRY_STATE_RETRY_POLICY_NOT_SET, null);
}

RetryOptions retryOptions = RetryOptionsUtils.toRetryOptions(activityTask.getRetryPolicy());
RetryOptions retryOptions = getRetryOptions(activityTask);

if (RetryOptionsUtils.isNotRetryable(retryOptions, attemptThrowable)) {
return new RetryDecision(RetryState.RETRY_STATE_NON_RETRYABLE_FAILURE, null);
Expand Down Expand Up @@ -368,11 +372,7 @@ private RetryState shouldStillRetry(
@Nullable Failure previousLocalExecutionFailure) {
int currentAttempt = activityTask.getAttempt();

if (isRetryPolicyNotSet(activityTask)) {
return RetryState.RETRY_STATE_RETRY_POLICY_NOT_SET;
}

RetryOptions retryOptions = RetryOptionsUtils.toRetryOptions(activityTask.getRetryPolicy());
RetryOptions retryOptions = getRetryOptions(activityTask);

if (previousLocalExecutionFailure != null
&& previousLocalExecutionFailure.hasApplicationFailureInfo()
Expand Down