chunked: various improvements #1072
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
giuseppe
force-pushed
the
chunked-improvements
branch
from
5349a54
to
8a89267
Compare
rhatdan
reviewed
Nov 23, 2021
pkg/chunked/storage_linux.go
Outdated
| @@ -230,21 +230,21 @@ func makeEstargzChunkedDiffer(ctx context.Context, store storage.Store, blobSize | |||
| func copyFileFromOtherLayer(file *internal.FileMetadata, source string, otherFile *internal.FileMetadata, dirfd int, useHardLinks bool) (bool, *os.File, int64, error) { | |||
| srcDirfd, err := unix.Open(source, unix.O_RDONLY, 0) | |||
| if err != nil { | |||
| return false, nil, 0, err | |||
| return false, nil, 0, errors.Wrapf(err, "open source file %q", source) | |||
There was a problem hiding this comment.
the unix.Open call doesn't include any extra information except the errno
rhatdan
reviewed
Nov 23, 2021
pkg/chunked/storage_linux.go
Outdated
| } | ||
| defer unix.Close(srcDirfd) | ||
|
|
||
| srcFile, err := openFileUnderRoot(otherFile.Name, srcDirfd, unix.O_RDONLY, 0) | ||
| if err != nil { | ||
| return false, nil, 0, err | ||
| return false, nil, 0, errors.Wrapf(err, "open source file %q under target rootfs", otherFile.Name) |
There was a problem hiding this comment.
I am worried about stutter here as well. Doesn't this end up calling an unix.Open()? Which will report an error with the file that the open failed on?
There was a problem hiding this comment.
no, it won't use unix.Open but call directly the openat2 wrapper, that only produces the UNIX error without any additional information.
rhatdan
reviewed
Nov 23, 2021
pkg/chunked/storage_linux.go
Outdated
| @@ -828,7 +828,10 @@ func safeSymlink(dirfd int, mode os.FileMode, metadata *internal.FileMetadata, o | |||
| destDirFd = int(f.Fd()) | |||
| } | |||
|
|
|||
| return unix.Symlinkat(metadata.Linkname, destDirFd, destBase) | |||
| if err := unix.Symlinkat(metadata.Linkname, destDirFd, destBase); err != nil { | |||
| return errors.Wrapf(err, "create symlink %q pointing to %q", metadata.Name, metadata.Linkname) | |||
There was a problem hiding this comment.
without the extra information, we only get the UNIX error without any pointer to what symlink we were creating
|
LGTM other then concerns about stutter. |
vrothberg
reviewed
Nov 23, 2021
pkg/chunked/storage_linux.go
Outdated
| @@ -89,7 +89,7 @@ func copyFileContent(srcFd int, destFile string, dirfd int, mode os.FileMode, us | |||
| src := fmt.Sprintf("/proc/self/fd/%d", srcFd) | |||
| st, err := os.Stat(src) | |||
| if err != nil { | |||
| return nil, -1, err | |||
| return nil, -1, errors.Wrapf(err, "copy file content for %q", destFile) | |||
There was a problem hiding this comment.
Nit: using fmt.Errorf would be more modern
giuseppe
force-pushed
the
chunked-improvements
branch
from
8a89267
to
8e3b7fa
Compare
thanks. Changed to use |
add more context to the error messages generated while unpacking the image. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
when creating a new file, handle the case where any of the parent directories are missing and create them automatically if needed. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
when dealing with symlink, open the parent directory and use the symlink basename to set its attributes. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
giuseppe
force-pushed
the
chunked-improvements
branch
from
8e3b7fa
to
a72972c
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.
some improvements and fixes for issues I've found while playing with docker.io/gscrivano/zstd-chunked:fcos-rawhide and docker.io/gscrivano/zstd-chunked:fcos-latest.
More details in each commit.
Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com