Fix activity timeout RetryState to return TIMEOUT for schedule timeouts #9132
+67
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When an activity times out due to ScheduleToStart or ScheduleToClose timeout, return RETRY_STATE_TIMEOUT instead of RETRY_STATE_NON_RETRYABLE_FAILURE. These schedule timeouts are server-enforced deadlines, not actual activity execution failures. The actual failure that caused retries (if any) is available in failure.Cause, which SDKs should surface to users since it represents the real failure. This approach maintains backward compatibility while providing correct semantics: 1. RETRY_STATE_TIMEOUT indicates a schedule timeout triggered the event 2. failure.Cause contains the last retry failure (existing behavior) 3. SDKs can check retry_state == TIMEOUT to surface failure.Cause Fixes: temporalio#3667 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
yiminc
force-pushed
the
fix-activity-timeout-retry-state
branch
from
bb04733 to
cff60d7
Compare
…eout TestActivityScheduleToClose_FiredDuringActivityRun now expects RETRY_STATE_TIMEOUT instead of RETRY_STATE_NON_RETRYABLE_FAILURE when a ScheduleToClose timeout fires during activity execution. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
yiminc
changed the title
1. Preserve original timeout type when RETRY_STATE_TIMEOUT is returned Previously, when RetryActivity returned RETRY_STATE_TIMEOUT, the timer executor would overwrite the timeout type to SCHEDULE_TO_CLOSE. This was based on the assumption that RETRY_STATE_TIMEOUT only occurred when the expiration time was exceeded during retry backoff calculation. With the fix to return RETRY_STATE_TIMEOUT for ScheduleToStart and ScheduleToClose timeout types directly, this overwriting caused incorrect timeout types to be recorded. For example, a ScheduleToStart timeout would incorrectly show as ScheduleToClose in the activity timed out event. The fix preserves the original timeout type from timerSequenceID.TimerType, which accurately reflects which timer actually fired. 2. Fix testifylint errors: use require for error assertions Change s.NoError(err) to s.Require().NoError(err) for error assertions in retry activity tests to satisfy the testifylint linter. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
yycptt
approved these changes
Jan 27, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
RETRY_STATE_TIMEOUTinstead ofRETRY_STATE_NON_RETRYABLE_FAILUREfailure.Cause, which SDKs should surface to usersTest plan
Fixes: #3667
🤖 Generated with Claude Code