executor: fix resource sampler goroutine leak #4081
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
jedevc
approved these changes
Jul 31, 2023
tonistiigi
reviewed
Jul 31, 2023
executor/runcexecutor/executor.go
Outdated
| @@ -335,7 +335,11 @@ func (w *runcExecutor) Run(ctx context.Context, id string, root executor.Mount, | |||
|
|
|||
| err = exitError(ctx, err) | |||
| if err != nil { | |||
| releaseContainer(context.TODO()) | |||
| if rec != nil { | |||
| rec.CloseAsync(releaseContainer) | |||
There was a problem hiding this comment.
I don't think we should change the release behavior depending on if recorder is enabled.
CloseAsync is an optimization to make sure the additional resource gathering and deleting cgroup by buildkit does not make container exec slower. But that case is not needed in case of error and I think the recorder should be just discarded synchronously instead of trying the sample it again async.
There was a problem hiding this comment.
Sounds good, I added a synchronous Close to the interface now and updated to call that in the error case.
Before this, the runc executor did not close the cgroupRecord when the container exited non-zero, which resulted in goroutines leaking. Signed-off-by: Erik Sipsma <erik@sipsma.dev>
sipsma
force-pushed
the
fix-resource-goroutine-leak
branch
from
052740d
to
fa11bf9
Compare
tonistiigi
approved these changes
Aug 1, 2023
Merged
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.
Before this, the runc executor did not close the cgroupRecord when the container exited non-zero, which resulted in goroutines leaking.
Verified the fix manually by getting goroutine stack dumps after builds that included failed execs finished, which previously showed a bunch of goroutines like this:
and now after the fix they are gone. Not sure if there's reasonable ways of adding an integ test for this at this time.