Fix iterable jobs cancellation #6589
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
|
Can you cherry pick that onto 7-x too? Don't worry about a PR. |
fatkodima
added a commit
that referenced
this pull request
Jan 25, 2025
|
Cherry-picked into 7-x. |
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.
Currently, cancelling an iterable job works only when the job was interrupted and it starts again. In this case the cancellation flag is checked correctly.
When the job is running, the flag's value is checked incorrectly, because it is set to a timestamp in the codebase.
sidekiq/lib/sidekiq/client.rb
Line 68 in 6a36028
I haven't added tests, because looks like it will be particularly hard to test this case (the test case should at least use a new interrupting thread).