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

Extend PutLayer to optimize reusing data from existing layers #1830

Merged
merged 2 commits into from
Feb 14, 2024

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Feb 13, 2024

  • If the caller does not provide digests (e.g. when reusing a layer found by LayersByTOCDigest), only digest uncompressed input once, not twice
  • Let the caller provide a CompressedSize value to match CompressedDigest, so that we don't create layers with incorrect metadata.

Motivated by containers/image#2288 .

Cc: @giuseppe (fairly low priority)

When the caller provides neither OriginalDigest nor
UncompressedDigest, only digest the layer once.

Signed-off-by: Miloslav Trmač <[email protected]>
This allows us to correctly set (CompresedDigest, CompressedSize)
when copying data from another layer; in that case we don't have the
compressed data, so computing the size from compressedCounter
sets an incorrect value.

Signed-off-by: Miloslav Trmač <[email protected]>
Copy link
Member

@giuseppe giuseppe 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 Feb 14, 2024

/approve
/lgtm

Copy link
Contributor

openshift-ci bot commented Feb 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, mtrmac, rhatdan

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:
  • OWNERS [giuseppe,mtrmac,rhatdan]

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

@openshift-merge-bot openshift-merge-bot bot merged commit 26f4312 into containers:main Feb 14, 2024
18 checks passed
@mtrmac mtrmac deleted the PutLayer-extensions branch February 14, 2024 19:14
mtrmac added a commit to mtrmac/image that referenced this pull request Feb 15, 2024
mtrmac added a commit to mtrmac/image that referenced this pull request Feb 15, 2024
mtrmac added a commit to mtrmac/image that referenced this pull request Feb 15, 2024
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.

3 participants