Repository navigation
Fix the forced stop timeout in the docker manager - #95
Merged
f-sommerauer merged 1 commit intoNov 6, 2026
Merged
Conversation
f-sommerauer
marked this pull request as ready for review
November 5, 2026 15:25
alshabib
approved these changes
Nov 5, 2026
Collaborator
|
Can resolve the conflicts here? |
ContainerStop derived the docker stop timeout from the RPC deadline with `int(time.Until(deadline)) / 2`. time.Until returns nanoseconds, so the value was always capped at maximumStopTimeout (10s) regardless of the deadline. With a deadline that had already passed it became negative, which docker treats as "wait indefinitely, never SIGKILL", the opposite of a forced stop. Compute the timeout in seconds (half of the remaining time, rounded) and bound it to [minimumStopTimeout=1s, maximumStopTimeout=10s]. Behaviour without a deadline (engine default) and without force (no SIGKILL) is unchanged.
f-sommerauer
force-pushed
the
containerz-stop-timeout
branch
from
November 6, 2026 08:30
0260fa6 to
c84153d
Compare
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
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.
ContainerStop derived the docker stop timeout from the RPC deadline with
int(time.Until(deadline)) / 2. time.Until returns nanoseconds, so thevalue was always capped at maximumStopTimeout (10s) regardless of the
deadline. With a deadline that had already passed it became negative,
which docker treats as "wait indefinitely, never SIGKILL", the opposite
of a forced stop.
Compute the timeout in seconds (half of the remaining time, rounded) and
bound it to [minimumStopTimeout=1s, maximumStopTimeout=10s]. Behaviour
without a deadline (engine default) and without force (no SIGKILL) is
unchanged.