Fix flakiness during import of a cache with empty layers removed#2372
Merged
tonistiigi merged 1 commit intomoby:masterfrom Sep 24, 2021
Merged
Fix flakiness during import of a cache with empty layers removed#2372tonistiigi merged 1 commit intomoby:masterfrom
tonistiigi merged 1 commit intomoby:masterfrom
Conversation
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.me>
d492a7c to
2c540bd
Compare
Contributor
Author
|
Tests are running fine on my repo: https://github.com/jgiannuzzi/buildkit/actions/runs/1261157927 I guess this is a transient error. Could a maintainer please re-run all jobs? 🙏 |
Member
|
@jgiannuzzi Done |
Contributor
Author
|
Thanks @crazy-max! |
tonistiigi
approved these changes
Sep 24, 2021
Member
tonistiigi
left a comment
There was a problem hiding this comment.
Thanks for taking the time to figure this out.
Member
|
@jgiannuzzi Now that you are familiar with this code, what is your thinking about removing the empty layer blob removal and always exporting empty layer blobs. It messes up the history array in image config and therefore reproducible builds and I don't have any better solution to fix that. I was also looking at Line 109 in deb1440 Load vs LoadWithParents thing could use some cleanup though. Initially, there was only Load but it wasn't enough for all use cases.
|
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 PR aims at fixing issues #1980 and #2198. It does so by ensuring that all results get returned by
cache.remotecache.v1.(*cacheResultStorage).LoadWithParents, and not only partial results, as can be the case when 2 or more vertexes point to the same result.See #2198 (comment) for more information about my understanding of the issue.