Simplify the tarball: transport #1923
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
rhatdan
reviewed
Apr 15, 2023
tarball/tarball_src.go
Outdated
| @@ -57,7 +55,7 @@ func (r *tarballReference) NewImageSource(ctx context.Context, sys *types.System | |||
| blobTime = time.Now() | |||
| reader = bytes.NewReader(r.stdin) | |||
| } else { | |||
| file, err = os.Open(filename) | |||
| file, err := os.Open(filename) | |||
| if err != nil { | |||
| return nil, fmt.Errorf("error opening %q for reading: %w", filename, err) | |||
There was a problem hiding this comment.
This is a stutter, can you just return err.
There was a problem hiding this comment.
Dropped the wrapping from the two os.Open errors.
Signed-off-by: Miloslav Trmač <[email protected]>
Should not change (test) behavior. Signed-off-by: Miloslav Trmač <[email protected]>
We only want a Reader, so be more precise. More importantly, we want to remove all instances of the habit to use bytes.NewBuffer instead of bytes.NewReader (which can actually be unsafe), although that concern does not directly apply to these calls Should not change (test) behavior. Signed-off-by: Miloslav Trmač <[email protected]>
NewBuffer documentation says > The new Buffer takes ownership of buf, and the > caller should not use buf after this call. which is not really what we want, and a potential risk. So, use the more directly applicable and safer bytes.Reader. Hopefully doesn't change behavior, except that reading the same laeyr from a tarball or sif transport is now well-defined. Signed-off-by: Miloslav Trmač <[email protected]>
The slice already contains that value. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
Should not change behavior Signed-off-by: Miloslav Trmač <[email protected]>
Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
This allows removing the blobTimes array. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
This allows us to remove the blobTypes array. Also fix a comment implying that only one layer can be present. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
Currently it only replaces blobIDs, replacing an O(N) scan with a hash lookup (although that's quite likely to be worse for the typical single-layer source); the use of fileIndex is a bit awkward. It will get better soon. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
Keep the data together and avoid extra indexing. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
Remove that separate array/indexing. This allows us to remove the short-lived fileIndex again. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
... in more cases, not just stdin. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
Use the same []byte storage for stdin layers and for configs; that allows us to drop the config-specific fields from tarballImageSource and simplify. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
The standard library's > open /this/does/not/exist: no such file or directory might be sufficient. Signed-off-by: Miloslav Trmač <[email protected]>
35277d7
to
9d0162f
Compare
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.
Track layer data in a single
map[digest]structinstead of 6 separate arrays, some completely unused, and other fields.Also simplify how that data is created, and fix pedantically-invalid uses of
bytes.NewBuffer.See individual commit messages for details.
(Motivated by containers/podman#18193 but this doesn’t do anything to actually fix it.)