Pass errors up the stack in CalculateWorld and InstallPackages #1404
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
smoser
force-pushed
the
fix/catch-failed-downloadds
branch
3 times, most recently
from
a5bbb7f to
d5d4236
Compare
|
@jonjohnsonjr This looks up your alley 👀 |
pkg/apk/apk/implementation.go
Outdated
| @@ -524,9 +524,9 @@ func (a *APK) CalculateWorld(ctx context.Context, allpkgs []*RepositoryPackage) | |||
| resolved := make([]*APKResolved, len(allpkgs)) | |||
|
|
|||
| // A slice of pseudo-promises that get closed when expanded[i] is ready. | |||
| done := make([]chan struct{}, len(allpkgs)) | |||
| done := make([]chan error, len(allpkgs)) | |||
There was a problem hiding this comment.
We can actually just delete these because there's nothing that reads from these channels. I think this was a copy-paste leftover.
pkg/apk/apk/implementation.go
Outdated
| @@ -700,13 +707,13 @@ func (a *APK) InstallPackages(ctx context.Context, sourceDateEpoch *time.Time, a | |||
| g.Go(func() error { | |||
| exp, err := a.expandPackage(ctx, pkg) | |||
| if err != nil { | |||
| return fmt.Errorf("expanding %s: %w", pkg, err) | |||
| err = fmt.Errorf("expanding %s: %w", pkg, err) | |||
There was a problem hiding this comment.
I would do something like:
g.Go(func() (rerr error) {
defer func() { done[i] <- rerr }()
exp, err := a.expandPackage(ctx, pkg)
if err != nil {
return fmt.Errorf("expanding %s: %w", pkg, err)
}
expanded[i] = exp
return nil
})That creates a named return (yucky but useful for this error handling stuff) and closes done[i] with the returned error (which is nil on success).
There was a problem hiding this comment.
I might not love this approach actually because now we need buffered channels instead of unbuffered if we're going to send 🤔
This problem was found in melange chainguard-dev/melange#1645 Any time a download failed, we would hang waiting for a close that would never occur. Signed-off-by: Scott Moser <[email protected]>
smoser
force-pushed
the
fix/catch-failed-downloadds
branch
from
d5d4236 to
3d2aa38
Compare
jonjohnsonjr
approved these changes
Nov 14, 2024
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.
Make sure to close channel in InstallPackages, cleanup in CalculateWorld
This problem was found in melange chainguard-dev/melange#1645
Any time a download failed, we would hang waiting for a close
that would never occur.