Fixes to storage’s GetBlob
#2394
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
debarshiray
reviewed
May 3, 2024
There was a problem hiding this comment.
Thanks, because I got tripped by these while reading the code in the context of containers/podman#22575
| @@ -107,12 +107,11 @@ func (s *storageImageSource) Close() error { | |||
| // GetBlob returns a stream for the specified blob, and the blob’s size (or -1 if unknown). | |||
| // The Digest field in BlobInfo is guaranteed to be provided, Size may be -1 and MediaType may be optionally provided. | |||
| // May update BlobInfoCache, preferably after it knows for certain that a blob truly exists at a specific location. | |||
| func (s *storageImageSource) GetBlob(ctx context.Context, info types.BlobInfo, cache types.BlobInfoCache) (rc io.ReadCloser, n int64, err error) { | |||
| func (s *storageImageSource) GetBlob(ctx context.Context, info types.BlobInfo, cache types.BlobInfoCache) (io.ReadCloser, int64, error) { | |||
There was a problem hiding this comment.
A combination of several deferred calls, and a return value that's a direct function call, which itself takes an unnamed function, makes these named return values treacherously confusing. :)
| @@ -177,7 +176,7 @@ func (s *storageImageSource) GetBlob(ctx context.Context, info types.BlobInfo, c | |||
| // On Unix and modern Windows (2022 at least) we can eagerly unlink the file to ensure it's automatically | |||
| // cleaned up on process termination (or if the caller forgets to invoke Close()) | |||
| // On older versions of Windows we will have to fallback to relying on the caller to invoke Close() | |||
| if err := os.Remove(tmpFile.Name()); err != nil { | |||
| if err := os.Remove(tmpFile.Name()); err == nil { | |||
There was a problem hiding this comment.
I had found myself scratching my head over this logic too but had set it aside because it didn't seem directly relevant to the issue at hand.
mtrmac
force-pushed
the
storage-GetBlob
branch
2 times, most recently
from
6883af1 to
a37e4f7
Compare
mtrmac
added
the
kind/bug
|
LGTM |
They get horribly confusing, especially here where we use "rc" for two completely different purposes: containers/podman#22575 (comment) Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
Try unlinking it when we are done using if we _don't_ succeed unlinking it first, not if we _do succeed_. Signed-off-by: Miloslav Trmač <[email protected]>
|
@giuseppe @mheon @debarshiray PTAL |
|
LGTM |
I already did. I couldn't spot any further changes after the initial version. :) |
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.
… tangentially related to containers/podman#22575 :