[release/0.9] Wait for waitInitExit() to return #1249#1264
Merged
helsaawy merged 2 commits intomicrosoft:release/0.9from Jan 6, 2022
Merged
[release/0.9] Wait for waitInitExit() to return #1249#1264helsaawy merged 2 commits intomicrosoft:release/0.9from
helsaawy merged 2 commits intomicrosoft:release/0.9from
Conversation
anmaxvl
approved these changes
Jan 6, 2022
Contributor
|
@helsaawy Can you cherry-pick both of the individual commits? |
The function passed into the Range function of sync.Map will stop the iteration if false is returned. This commit makes sure we iterate through all elements in the map. Signed-off-by: Gabriel Adrian Samfira <[email protected]> (cherry picked from commit 76881a2) Signed-off-by: Hamza El-Saawy <[email protected]>
This change gives waitInitExit() a chance to cleanup resource when DeleteExec() is called, before returning. This should fix situations where the shim exits before releasing container resources. Signed-off-by: Gabriel Adrian Samfira <[email protected]> (cherry picked from commit a6edb25) Signed-off-by: Hamza El-Saawy <[email protected]>
ef94fdc to
c82af14
Compare
dcantah
approved these changes
Jan 6, 2022
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
4 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.
This change gives waitInitExit() a chance to cleanup resource when DeleteExec() is called, before returning.
TL;DR
This should fix situations where the shim exits before releasing container resources.
(cherry picked from commit 6241c53)
Signed-off-by: Hamza El-Saawy [email protected]