Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

composefs: add parent directory if missing #1929

Conversation

giuseppe
Copy link
Member

it solves this error with mkcomposefs when the TOC doesn't specify the parent directory for an entry:

Error: committing the finished image: failed to put layer using a partial pull: failed to convert json to erofs: exit status 1: mkcomposefs: Parent directory missing for /usr/share/locale/ca/LC_MESSAGES/libc.mo

Copy link
Contributor

openshift-ci bot commented May 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rhatdan
Copy link
Member

rhatdan commented May 27, 2024

LGTM
@mtrmac PTAL

Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM otherwise.

@@ -218,7 +233,7 @@ func GenerateDump(tocI interface{}, verityDigests map[string]string) (io.Reader,
Mode: 0o755,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn’t this special case for / now redundant with the new logic?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could drop the condition || (sanitizeName(toc.Entries[0].Name) != "/") but we still need it for len(toc.Entries) == 0 as we never call dumpNode()

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I didn’t realize that was also a practical possibility.

I do think removing the second condition would be valuable in itself — and it would make the “empty entries” special case a bit more noticeable.

@giuseppe giuseppe force-pushed the compose-fs-add-missing-dir-parents branch 2 times, most recently from bcb1352 to 2c6d8a5 Compare May 28, 2024 09:45
it solves this error with mkcomposefs when the TOC doesn't specify the
parent directory for an entry:

Error: committing the finished image: failed to put layer using a partial pull: failed to convert json to erofs: exit status 1: mkcomposefs: Parent directory missing for /usr/share/locale/ca/LC_MESSAGES/libc.mo

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe giuseppe force-pushed the compose-fs-add-missing-dir-parents branch from 2c6d8a5 to 6b1c044 Compare May 28, 2024 09:52
Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm label May 28, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 989e69d into containers:main May 28, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants