Fix running job cancellation when not fetching #678
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
bgentry
commented
Nov 15, 2024
client_test.go
Outdated
Comment on lines
518
to
516
| t.Parallel() | ||
| t.Run("AlternateSchema", func(t *testing.T) { | ||
|
|
||
| client, _ := setup(t) | ||
| t.Run("CancelRunningJobInTx", func(t *testing.T) { |
There was a problem hiding this comment.
Not sure what happened here 🤦♂️ fixing
bgentry
force-pushed
the
bg-fix-cancellation-outside-fetch
branch
from
37af32d to
f0d65ab
Compare
Cancellation of running jobs relied on a channel that was only being received when in the job fetch routine, meaning that jobs which were cancelled would not be cancelled until the next scheduled fetch. This was fixed by also receiving from the job cancellation channel when in the main producer loop, even if no fetches are happening.
bgentry
force-pushed
the
bg-fix-cancellation-outside-fetch
branch
from
f0d65ab to
f1ba47a
Compare
tigrato
pushed a commit
to gravitational/river
that referenced
this pull request
Dec 18, 2024
* fix running job cancellation when not fetching Cancellation of running jobs relied on a channel that was only being received when in the job fetch routine, meaning that jobs which were cancelled would not be cancelled until the next scheduled fetch. This was fixed by also receiving from the job cancellation channel when in the main producer loop, even if no fetches are happening.
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.
Cancellation of running jobs relied on a channel that was only being
received when in the job fetch routine, meaning that jobs which were
cancelled would not be cancelled until the next scheduled fetch.
This was fixed by also receiving from the job cancellation channel when
in the main producer loop, even if no fetches are happening.