build: make sure defers always run in the end of the build #3133
Conversation
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
3 tasks
Thanks for looking into this! Should we keep the ticket open until that part is addressed? (I haven't dug into the code yet to see where those are created; is that something I could look into? Not sure if it's complicated). |
thaJeztah
reviewed
Apr 19, 2025
Comment on lines
-208
to
-215
| defers := make([]func(), 0, 2) | ||
| defer func() { | ||
| if err != nil { | ||
| for _, f := range defers { | ||
| f() | ||
| } | ||
| } | ||
| }() |
There was a problem hiding this comment.
Curious if this approach (collect the release functions and a single defer would still be preferred, but possibly without the if err != nil ? I know some linters will complain about the defer release() in a loop.
crazy-max
reviewed
Apr 19, 2025
build/build.go
Outdated
| @@ -247,7 +238,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opts map[ | |||
| return nil, err | |||
| } | |||
| addGitAttrs(so) | |||
| defers = append(defers, release) | |||
| defer release() | |||
There was a problem hiding this comment.
I think this should be moved right before saveLocalState
Signed-off-by: Tonis Tiigi <[email protected]>
tonistiigi
force-pushed
the
build-defers-fix
branch
from
06d088e to
19c2213
Compare
crazy-max
approved these changes
Apr 22, 2025
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.
fix #3117
Avoiding creating temp dir for stdin can be done in a follow-up.