Skip to content

[release/1.1] fix pipe in broken may cause shim lock forever for runtime v1#2816

Merged
dmcgowan merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_shimlockwhenstdinclose
Nov 20, 2018
Merged

[release/1.1] fix pipe in broken may cause shim lock forever for runtime v1#2816
dmcgowan merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_shimlockwhenstdinclose

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of #2807 for the 1.1 branch (only the V1 changes)
relates to moby/moby#38064

git checkout -b 1.1_backport_shimlockwhenstdinclose upstream/release/1.1
git cherry-pick -s -S -x e76a8879eb10594113d70556c80dd2e456202e22
git push -u origin

cherry-pick wasn't clean because the v1 commit contained a comment-only
change in a v2 file, but trivial to resolve

Signed-off-by: Lifubang <[email protected]>
(cherry picked from commit e76a887)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@crosbymichael
Copy link
Copy Markdown
Member

LGTM

1 similar comment
@dmcgowan
Copy link
Copy Markdown
Member

LGTM

@dmcgowan dmcgowan merged commit 943f15f into containerd:release/1.1 Nov 20, 2018
@thaJeztah thaJeztah deleted the 1.1_backport_shimlockwhenstdinclose branch November 20, 2018 20:55
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.

4 participants