builder: fix pull synchronization regression#42035
Merged
Merged
Conversation
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 <[email protected]>
tonistiigi
force-pushed
the
builder-pull-fix
branch
from
February 17, 2021 06:49
33d2615 to
b53ea19
Compare
tonistiigi
changed the title
thaJeztah
added
area/builder
Member
|
@tiborvass @AkihiroSuda PTAL |
AkihiroSuda
approved these changes
Feb 18, 2021
|
Thanks a lot ya'll. Quick turnaround on this one! |
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
5 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.
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 wrong key as ref
variable is initialized only after in the same function. This means that
on parallel config pulls keys can collide and one side is ignored. Using
right key isn't fully correct either as the syncronized method
changes properties of the puller instance and can't be just skipped.
Added better error handling for the same case as well.
@DRoet @summera
Signed-off-by: Tonis Tiigi [email protected]