Fix: asoctl deadlock #4475
Merged
Fix: asoctl deadlock #4475
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
theunrepentantgeek
requested review from
davefellows,
matthchr,
babbageclunk and
super-harsh
as code owners
| case rsrc, ok := <-resources: | ||
| if !ok { | ||
| // Channel closed | ||
| running = false |
There was a problem hiding this comment.
It'd be clearer to label the for loop and use a labelled break here (assuming I haven't missed some other stuff that needs to happen after the select).
super-harsh
reviewed
Dec 3, 2024
super-harsh
approved these changes
Dec 4, 2024
babbageclunk
approved these changes
Dec 4, 2024
| } | ||
|
|
||
| // Close the channel when we're done, so that workers shut down too | ||
| close(uniqueResources) |
There was a problem hiding this comment.
Defer this at the top of the goroutine func to ensure it's closed even in the case of panics?
Comment on lines
297
to
298
| ri.reporter.Completed(1) | ||
| watchdog.stopped() |
There was a problem hiding this comment.
I'd put these into a method on ResourceImporter and then call it from both the success and error workers. Tying them together makes it harder to forget to do it in one place.
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.
What this PR does
Fixes an ASO deadlock introduced in #4452.
The immediate cause of the deadlock was an omitted call to
Completed(1)when collating import errors, leaving the progress bar incomplete.However, this coupling between the progress bar and the importer isn't ideal, and leaves the door open for addition problems in the future. To avoid this, I've made two additional changes.
watchdogto keep track of inflight resources, to monitor the import, and to shut things down when everything is done