Call container.Terminate() on shutdown timeouts #1488
Merged
Conversation
This file contains 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
We were logging if HcsShutdownComputeSystem failed, but we weren't trying to force kill the container via Terminate after if we timed out waiting for it to complete. Shutdown is async and we wait for a notification for success, so most of the time the call itself will return nil, but it doesn't indicate indicate success until we can see that the system exited. So now we will fallback to Terminate for: 1. Shutdown returning an error that doesn't indicate the result is to be waited on. 2. The async result of shutdown was non-nil 3. Waiting for the result passed the timeout we set. Signed-off-by: Daniel Canter <dcanter@microsoft.com>
helsaawy
approved these changes
Aug 24, 2022
anmaxvl
approved these changes
Aug 24, 2022
kiashok
pushed a commit
to kiashok/hcsshim
that referenced
this pull request
Oct 29, 2022
Call container.Terminate() on shutdown timeouts (cherry picked from commit f12cf48) Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We were logging if HcsShutdownComputeSystem failed, but we weren't
trying to force kill the container via Terminate after if we timed
out waiting for it to complete. Shutdown is async and we wait for
a notification for success, so most of the time the call itself will
return nil, but it doesn't indicate indicate success until we can
see that the system exited. So now we will fallback to Terminate for:
to be waited on.