Skip to content

chunked: skip cache file for non-partial layers#1910

Merged
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
giuseppe:do-not-create-cache-file-for-not-partial-layers
Apr 24, 2024
Merged

chunked: skip cache file for non-partial layers#1910
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom
giuseppe:do-not-create-cache-file-for-not-partial-layers

Conversation

@giuseppe
Copy link
Member

if the layer does not have a manifest TOC, just ignore it instead of raising a warning. There is no need to create a cache file since there is no manifest file to parse.

Closes: #1909

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 24, 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

Details 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 Apr 24, 2024

LGTM
@mtrmac @Luap99 PTAL

if the layer does not have a manifest TOC, just ignore it instead of
raising a warning.  There is no need to create a cache file since
there is no manifest file to parse.

Closes: containers#1909

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe giuseppe force-pushed the do-not-create-cache-file-for-not-partial-layers branch from af0e73b to 881107d Compare April 24, 2024 15:18
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

@rhatdan
Copy link
Member

rhatdan commented Apr 24, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Apr 24, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 3cbd3c6 into containers:main Apr 24, 2024
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.

Technically this works — but I’d really expect the early exit to be, well, more early.

Historically bigDataKey was used before we added chunkedLayerDataKey, so maybe start reading bigDataKey, and immediately cleanly exit if that one is missing; then we can optionally load the other one.

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.

composefs: Error creating cache file for layer "sha": blah blah zstd blah blah

4 participants