[20.10 backport] builder: fix pull synchronization regression #42049
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
Config resolution was synchronized based on a wrong key as ref variable is initialized only after in the same function. Using the right key isn't fully correct either as the synchronized method changes properties of the puller instance and can't be just skipped. Added better error handling for the same case as well. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit b53ea19) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added
area/builder
status/2-code-review
impact/changelog
kind/bugfix
tiborvass
approved these changes
Feb 23, 2021
tonistiigi
approved these changes
Feb 23, 2021
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.
backport of #42035
fixes moby/buildkit#1939 ("Failed to compute cache key in newer version")
regression from dbffbe8 and 8f464ae (#41601) (v20.10 only) . Buildkit standalone/buildx is not affected.
Config resolution was synchronized based on a wrong key as ref
variable is initialized only after in the same function. Using
the right key isn't fully correct either as the synchronized method
changes properties of the puller instance and can't be just skipped.
Added better error handling for the same case as well.
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com
(cherry picked from commit b53ea19)
Signed-off-by: Sebastiaan van Stijn github@gone.nl
- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)