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

Update for c/storage almost always computing UncompressedDigest #2680

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Jan 9, 2025

After containers/storage#2155 , we ~always compute UncompressedDigest, but the current code was expecting that to happen only when convert_images is set (and we consume the whole compressed blob).

That is breaking pulls of chunked images, e.g. https://api.cirrus-ci.com/v1/artifact/task/6559054106984448/html/sys-podman-debian-13-rootless-host-sqlite.log.html :

internal error: PrepareStagedLayer returned CompressedDigest "" not matching expected "sha256:…"

Update the code to not blindly assume that CompressedDigest is set, and to expect UncompressedDigest to be set much more frequently. Originally from #2613 , and tested as a part of the full patch set.

Separate Podman tests to confirm this truly fixes the test failure: containers/podman#24991 .

@giuseppe PTAL.

We will want c/storage to do that in order to avoid the traditional/partial "view"
ambiguity.

Signed-off-by: Miloslav Trmač <[email protected]>
@mtrmac
Copy link
Collaborator Author

mtrmac commented Jan 9, 2025

Podman tests (corresponding to the previous failure) are passing in containers/podman#24991 , this is ready for review.

@mtrmac mtrmac marked this pull request as ready for review January 9, 2025 23:14
@rhatdan
Copy link
Member

rhatdan commented Jan 10, 2025

LGTM

@vrothberg vrothberg merged commit 27a33b7 into containers:main Jan 10, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants