Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

differ: fix deadlock on commit error #3241

Merged
merged 1 commit into from Apr 26, 2019

Conversation

tonistiigi
Copy link
Member

In moby/buildkit#960 differ error is produced that was fixed in containerd/continuity#140 . When this error was reached the writer was not properly released resulting a "locked" message for next invocations. This PR fixes the line involved so the error does not get masked, and two other cases where errors would have also been swallowed previously.

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@crosbymichael
Copy link
Member

LGTM

@AkihiroSuda AkihiroSuda merged commit 3a3f0aa into containerd:master Apr 26, 2019
@dmcgowan dmcgowan added this to the 1.3-beta.0 milestone Apr 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants