-
Notifications
You must be signed in to change notification settings - Fork 382
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
Record zstd:chunked format, and annotations, in BlobInfoCache #2487
Merged
Conversation
This file contains 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
36 tasks
mtrmac
force-pushed
the
chunked-bic2
branch
2 times, most recently
from
July 24, 2024 20:28
9a182e2
to
1d6935c
Compare
mtrmac
force-pushed
the
chunked-bic2
branch
2 times, most recently
from
July 27, 2024 15:30
8ffa23f
to
e0ff591
Compare
mtrmac
force-pushed
the
chunked-bic2
branch
3 times, most recently
from
July 27, 2024 20:01
6256d87
to
8622767
Compare
mtrmac
force-pushed
the
chunked-bic2
branch
7 times, most recently
from
July 30, 2024 18:36
9d1e0c0
to
ca35041
Compare
mtrmac
force-pushed
the
chunked-bic2
branch
4 times, most recently
from
August 6, 2024 08:55
5b924e1
to
1c9557d
Compare
To test:
|
If we don't know an uncompressed digest, don't try using "". Signed-off-by: Miloslav Trmač <[email protected]>
Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
The cache implementations are recording both the base and specific compression variant; CandidateLocations2 all call CandidateTemplateWithCompression to choose the appropriate variants to return based on CandidateLocations2Options. This way, neither the BIC implementations nor the transports are not responsible for converting zstd:chunked entries to zstd entries if the user wants the latter. Signed-off-by: Miloslav Trmač <[email protected]>
Introduce distinct uploadedCompressorBaseVariantName and uploadedCompressorSpecificVariantName fields; that way we now never call RecordDigestCompressorData with inconsistent zstd / zstd:chunked in one field, so we can always record data when we see, or create, a zstd:chunked layer, removing the current hack. Signed-off-by: Miloslav Trmač <[email protected]>
- Add a CompressionAnnotations field - Allow turning a known-zstd blob into a zstd:chunked one if we know the right annotations This just adds the fields, nothing sets them yet, should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
- Return the required annotations, if we have them - If we have a zstd blob and the BIC contains the annotations, we don't check for the blob's presence initially. In that case, don't skip it if we find the BIC annotations. Signed-off-by: Miloslav Trmač <[email protected]>
... instead of only treating it as zstd. Signed-off-by: Miloslav Trmač <[email protected]>
Now ready for review. Podman tests are exercised in containers/podman#23397 . @giuseppe PTAL ; Cc: @kolyshkin |
mtrmac
changed the title
WIP: Record zstd:chunked format, and annotations, in BlobInfoCache
Record zstd:chunked format, and annotations, in BlobInfoCache
Aug 6, 2024
giuseppe
approved these changes
Aug 7, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
LGTM
LGTM |
This was referenced Aug 7, 2024
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.
WIP, premature to review.This should allow re-using on-registry zstd:chunked data on push, instead of re-pushing every time, or making the output not chunked.
This includes #2321, I’m filing it early just to have an URL to link to in #2189.