Repository navigation
composefs-oci: logging and FileBackedData prep for the skopeo import - #418
Merged
cgwalters merged 4 commits intoOct 19, 2026
Merged
Conversation
Signed-off-by: Giuseppe Scrivano <giuseppe@scrivano.org>
Take the already-built `GetLayerParams` instead of a storage path, a layer ID and a `consumer_has_cap_dac_override` flag, and build it at each call site. That drops three of the seven parameters (and with them the `too_many_arguments` exemption), and lets callers that locate a layer some other way than by storage path reuse the function. Make it `pub(crate)` for the same reason. Signed-off-by: Giuseppe Scrivano <giuseppe@scrivano.org>
Whether a file arrived as bytes over the pipe or was opened by us from a delegated containers-storage dirfd is the whole point of the splitdirfdstream transfer, and today nothing reports it. Count both while draining and log the summary, with a trace line per file. Signed-off-by: Giuseppe Scrivano <giuseppe@scrivano.org>
A FileBackedData chunk names the file holding a tar entry's content, and a tar entry name need not be UTF-8. The format carries the name as bytes, but drain_splitdirfdstream rejected anything that was not UTF-8, so a layer with such a name failed to import, or forced the producer to send its content inline. Open the name as the bytes it is, and only use a lossy rendering of it in messages. Signed-off-by: Giuseppe Scrivano <giuseppe@scrivano.org> Assisted-by: AI
cgwalters
approved these changes
Oct 19, 2026
| ); | ||
| } | ||
|
|
||
| /// A tar entry name need not be UTF-8, so neither does the name a |
Collaborator
There was a problem hiding this comment.
This looks sane, but it'd probably also make sense to have an integration test that reuses some kind of "pathological container image" I think we share in multiple places perhaps? e.g. also exercise path names near PATH_MAX etc
This was referenced Oct 22, 2026
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
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.
preparation work for: #417