Skip to content

[20.10 backport] builder: fix pull synchronization regression#42049

Merged
thaJeztah merged 1 commit into
moby:20.10from
thaJeztah:20.10_backport_builder_pull_fix
Feb 23, 2021
Merged

[20.10 backport] builder: fix pull synchronization regression#42049
thaJeztah merged 1 commit into
moby:20.10from
thaJeztah:20.10_backport_builder_pull_fix

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

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 [email protected]
(cherry picked from commit b53ea19)
Signed-off-by: Sebastiaan van Stijn [email protected]

- 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)

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]>
(cherry picked from commit b53ea19)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah

Copy link
Copy Markdown
Member Author

@AkihiroSuda @tonistiigi @cpuguy83 ptal

@thaJeztah
thaJeztah merged commit f3d130d into moby:20.10 Feb 23, 2021
@thaJeztah
thaJeztah deleted the 20.10_backport_builder_pull_fix branch February 23, 2021 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants