github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Double StopContainer request timeout.

Browse Source
This commit is contained in:
Random-Liu 2017-05-22 22:59:57 -07:00
parent b6211c6e79
commit 5f0288e022
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/remote/remote_runtime.go
View File

@ -209,11 +209,10 @@ func (r *RemoteRuntimeService) StartContainer(containerID string) error {
// StopContainer stops a running container with a grace period (i.e., timeout). // StopContainer stops a running container with a grace period (i.e., timeout).
func (r *RemoteRuntimeService) StopContainer(containerID string, timeout int64) error { func (r *RemoteRuntimeService) StopContainer(containerID string, timeout int64) error {
ctx, cancel := getContextWithTimeout(time.Duration(timeout) * time.Second) // Use timeout + default timeout (2 minutes) as timeout to leave extra time
if timeout == 0 { // for SIGKILL container and request latency.
// Use default timeout if stop timeout is 0. t := r.timeout + time.Duration(timeout)*time.Second
ctx, cancel = getContextWithTimeout(r.timeout) ctx, cancel := getContextWithTimeout(t)
}
defer cancel() defer cancel()
_, err := r.runtimeClient.StopContainer(ctx, &runtimeapi.StopContainerRequest{ _, err := r.runtimeClient.StopContainer(ctx, &runtimeapi.StopContainerRequest{