Docker stop timeout buffer increased from 30s to 2m #2697
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
sparrc
force-pushed
the
stop-container-timeout
branch
3 times, most recently
from
142b8c6 to
85c30da
Compare
sparrc
changed the title
sparrc
changed the title
sparrc
force-pushed
the
stop-container-timeout
branch
3 times, most recently
from
382d41a to
c0dbcd6
Compare
sparrc
changed the title
sparrc
changed the title
sparrc
force-pushed
the
stop-container-timeout
branch
from
c0dbcd6 to
4f0d1ef
Compare
angelcar
approved these changes
Nov 3, 2020
shubham2892
approved these changes
Nov 4, 2020
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.
Summary
When we call docker stopContainer, we pass to docker both a context (which has a timeout) and a timeout. The context is for cancelling the entire request if it's taking too long, the timeout is for docker to timeout the inner
docker stopcommand. If stop fails, dockerd will fallback to trying to kill the process using harsher methods. To give the harsher methods time to finish, we add a buffer to the context on the request.This PR increases that buffer from 30s to 2m, and also removes an unnecessary (and misleading) constant
StopContainerTimeoutTesting
New tests cover the changes: no
Description for the changelog
enhancement - Docker stop timeout buffer increased from 30s to 2m
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.