worker/docker: Destroy containers from watch routines#3781
Merged
Conversation
There was a slight race condition on shutdown as the watch routines tried to recreate the containers as we were removing them on shutdown. Fixing this by keeping the lifecycle management in the watch container routine itself.
github-actions
bot
added
go
j0sh
approved these changes
Oct 20, 2025
Collaborator
j0sh
left a comment
j0sh
left a comment
There was a problem hiding this comment.
Seems ok, it's a little confusing with the global context in addition to the per function contexts in Stop / Borrow but I don't really understand this bit enough to offer more constructive feedback, so LGTM
| select { | ||
| case <-done: | ||
| return nil | ||
| case <-ctx.Done(): |
Collaborator
There was a problem hiding this comment.
Should m.ctx.Done() be checked as well or is that implicit in the wait group / done?
Contributor
Author
There was a problem hiding this comment.
Actually the manager's ctx will always be done here, since we call m.stop() in the beginning
Co-authored-by: Josh Allmann <joshua.allmann@gmail.com>
Co-authored-by: Josh Allmann <joshua.allmann@gmail.com>
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 does this pull request do? Explain your changes. (required)
There was a slight race condition on shutdown as the watch routines tried to recreate the containers as we were removing them on shutdown.
Fixing this by keeping the lifecycle management in the watch container routine itself.
Specific updates (required)
ctxfor the whole DockerManager which is closed on StopHow did you test each of these updates (required)
The box ™️
Does this pull request close any open issues?
Fixes orphan containers after O shutdown.
Checklist:
makeruns successfully./test.shpass