remotecache: replace CheckDescriptor with Info #4784
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
tonistiigi
force-pushed
the
checkdescriptor-info
branch
from
28665c2 to
756f26c
Compare
tonistiigi
commented
Mar 20, 2024
| @@ -313,10 +313,22 @@ func (p lazyRefProvider) Info(ctx context.Context, dgst digest.Digest) (content. | |||
| if dgst != p.desc.Digest { | |||
| return content.Info{}, errdefs.ErrNotFound | |||
| } | |||
| if err := p.Unlazy(ctx); err != nil { | |||
| return content.Info{}, errdefs.ErrNotFound | |||
| info, err := p.ref.cm.ContentStore.Info(ctx, dgst) | |||
There was a problem hiding this comment.
I changed the behavior of this function as worker.FromRemote() and cache marshaling uses this function to detect that content is available without opening reader or unlazy.
@ktock Looks like a stargz test broke so I think this was somehow used. Is it required for the unlazy to happen here (or maybe the test issue is something else)? The function was added in https://github.com/moby/buildkit/pull/4558/files#diff-c01e7be139ae4532b9aeef7b932fe60d3eb81680a7f4669b9dd0992ce71284f5R312 so I'm surprised it has this effect.
ktock
reviewed
Mar 20, 2024
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
checkdescriptor-info
branch
from
756f26c to
da7aa16
Compare
ktock
approved these changes
Mar 20, 2024
|
cc @vvoland |
vvoland
approved these changes
Mar 20, 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.
This tries to replace the
CheckDescriptorinterface detection with theInfo()method that was added in v0.13 to the provider to avoid cases like #4771 .