RetireWorker policy is done if removed
#6234
Merged
Conversation
This file contains 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
2 tasks
`test_RetireWorker_no_recipients` and `test_RetireWorker_all_recipients_are_paused` were failling withou this.
|
This actually caused a bug, fixed in e95fdba. Thanks for the great tests that caught this @crusaderky! Added a test for this change in a separate PR: #6240. I think the test will take longer to get in, but I believe we're confident in this change and would like to get it in the release. |
crusaderky
reviewed
Apr 28, 2022
crusaderky
approved these changes
Apr 28, 2022
This was referenced Apr 28, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #6223, using the fix discussed in #6223 (comment).
This eliminates the race condition where:
RetireWorkerAMM policy completes (all keys have been moved off the worker), so it removes itself from the AMM policies—done()is true at this moment._track_retire_workerawakens, new keys have shown up on the worker, soRetireWorker.done()is now Falsewhile not policy.done()loop runs forever.Now, we say the policy is also done if it's been removed.
I'm still working on a test, but hopefully @bnaul can confirm whether this seems to resolve the problem.
pre-commit run --all-files