10BC0 [18.09] libcontainerd: prevent exec delete locking by andrewhsu · Pull Request #140 · docker-archive/engine · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] libcontainerd: prevent exec delete locking #140

Merged
merged 2 commits into from
Dec 17, 2018
Merged

[18.09] libcontainerd: prevent exec delete locking #140

merged 2 commits into from
Dec 17, 2018

Conversation

andrewhsu
Copy link

Talked with @tonistiigi about moby#38374 (comment) and worked out an alternative approach for the 18.09 codeline.

This PR reverts #139. Instead, an alternative backport moby#38383 is brought in.

$ git revert -s b6430ba
$ git cherry-pick -s -x 332f134
[d 6646d08782] libcontainerd: prevent exec delete locking
 Author: Tonis Tiigi <tonistiigi@gmail.com>
 Date: Mon Dec 17 12:22:37 2018 +0200
 1 file changed, 7 insertions(+), 2 deletions(-)

andrewhsu and others added 2 commits December 17, 2018 12:06
@andrewhsu
Revert "Propagate context to exec delete"
a9ae6c7 
This reverts commit b6430ba.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
8000
@tonistiigi @andrewhsu
libcontainerd: prevent exec delete locking
6646d08 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 332f134)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 18.09.1 milestone Dec 17, 2018
@crosbymichael
Copy link

LGTM

@andrewhsu andrewhsu merged commit 484a3c3 into docker-archive:18.09 Dec 17, 2018
@andrewhsu andrewhsu deleted the d branch December 17, 2018 15:15
@tgross tgross mentioned this pull request Jan 10, 2019
Open
3 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@crosbymichael crosbymichael Awaiting requested review from crosbymichael

1 more reviewer

@tonistiigi tonistiigi tonistiigi approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.09.1

Development

Successfully merging this pull request may close these issues.

3 participants

@andrewhsu @crosbymichael @tonistiigi
0