[release/1.3] cherry-pick: runtime v2: Close platform in runc shim's Shutdown method.#3907
Merged
crosbymichael merged 1 commit intocontainerd:release/1.3from Dec 23, 2019
Merged
Conversation
|
Build succeeded.
|
Member
Author
|
Needs #3908 to pass CI |
Previously, the platform was closed as part of the Delete method when the process was an init for a task and there were no more tasks after its deletion. This can create problems if another task is created within the shim right after the delete runs, which results in the platform being closed but the shim continuing to run. This change moves closing the platform to the Shutdown method after the shim's context is canceled, which ensures the platform is only closed once the shim is sure its done servicing containers. Signed-off-by: Erik Sipsma <[email protected]> Signed-off-by: Phil Estes <[email protected]>
estesp
force-pushed
the
cp-platform-close-fix
branch
from
c038238 to
e7a6dda
Compare
|
Build succeeded.
|
Codecov Report
@@ Coverage Diff @@
## release/1.3 #3907 +/- ##
============================================
Coverage 42.07% 42.07%
============================================
Files 129 129
Lines 14322 14322
============================================
Hits 6026 6026
Misses 7395 7395
Partials 901 901
Continue to review full report at Codecov.
|
Member
|
LGTM |
Member
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.
Previously, the platform was closed as part of the Delete method when the
process was an init for a task and there were no more tasks after its deletion.
This can create problems if another task is created within the shim right after
the delete runs, which results in the platform being closed but the shim
continuing to run.
This change moves closing the platform to the Shutdown method after the shim's
context is canceled, which ensures the platform is only closed once the shim
is sure its done servicing containers.
Signed-off-by: Erik Sipsma [email protected]
Signed-off-by: Phil Estes [email protected]