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

[release/0.9] Wait for waitInitExit() to return #1249 #1264

Merged
merged 2 commits into from
Jan 6, 2022

Conversation

helsaawy
Copy link
Contributor

@helsaawy helsaawy commented Jan 6, 2022

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]

@helsaawy helsaawy requested a review from a team as a code owner January 6, 2022 16:46
@dcantah
Copy link
Contributor

dcantah commented Jan 6, 2022

@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]>
@helsaawy helsaawy force-pushed the he/backport-waitinitexit branch from ef94fdc to c82af14 Compare January 6, 2022 18:09
@helsaawy helsaawy merged commit 51b804f into microsoft:release/0.9 Jan 6, 2022
@helsaawy helsaawy deleted the he/backport-waitinitexit branch January 6, 2022 22:05
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