Fix SAA unpause for keep-paused reset#10914
Merged
fretz12 merged 2 commits intoJul 8, 2026
Merged
Conversation
When a running activity has a deferred reset with keep_paused=true, unpause should clear only ResetKeepPaused while preserving the pending reset.
spkane31
approved these changes
Jul 7, 2026
Base automatically changed from
fredtzeng/saa-preserve-retry-backoff
to
feature/activity-operator-cmds
July 8, 2026 21:07
fretz12
merged commit d90cf35
into
feature/activity-operator-cmds
70 of 73 checks passed
fretz12
added a commit
that referenced
this pull request
Jul 10, 2026
## What changed? Fixed SAA unpause handling for activities in `RESET_REQUESTED` with `ResetKeepPaused=true`. Unpause now clears only the keep-paused intent while preserving the deferred reset. Added an e2e standalone activity test covering pause → reset with `keep_paused=true` → unpause before the worker reports back. ## Why? A deferred reset can carry two separate intents: apply the reset after the in-flight worker attempt reports back, and keep the reset attempt paused. Before this change, unpause did not clear the keep-paused intent while the reset was still deferred, so the activity could remain paused after the worker failed even though the user had already unpaused it. ## How did you test it? - [X] built - [X] run locally and tested manually - [ ] covered by existing tests - [ ] added new unit test(s) - [X] added new functional test(s)
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
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.
What changed?
Fixed SAA unpause handling for activities in
RESET_REQUESTEDwithResetKeepPaused=true.Unpause now clears only the keep-paused intent while preserving the deferred reset. Added an e2e standalone activity test covering pause → reset with
keep_paused=true→ unpause before the worker reports back.Why?
A deferred reset can carry two separate intents: apply the reset after the in-flight worker attempt reports back, and keep the reset attempt paused.
Before this change, unpause did not clear the keep-paused intent while the reset was still deferred, so the activity could remain paused after the worker failed even though the user had already unpaused it.
How did you test it?