github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

kubelet: allow dockershim exec timeouts to be longer than 10s

Browse Source 
Signed-off-by: Andrew Sy Kim <kim.andrewsy@gmail.com>
This commit is contained in:
Andrew Sy Kim 2020-08-22 15:15:59 -04:00
parent 81ad32e3a4
commit 8ef299552b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/dockershim/exec.go
View File

@ -117,7 +117,7 @@ func (*NativeExecHandler) ExecInContainer(client libdocker.Interface, container
execTimeout = time.After(timeout) execTimeout = time.After(timeout)
} else { } else {
// skip exec timeout if provided timeout is 0 // skip exec timeout if provided timeout is 0
execTimeout = make(chan time.Time, 1) execTimeout = nil
} }
ticker := time.NewTicker(2 * time.Second) ticker := time.NewTicker(2 * time.Second)
@ -148,11 +148,15 @@ func (*NativeExecHandler) ExecInContainer(client libdocker.Interface, container
return nil return nil
} }
// Only limit the amount of InspectExec calls if the exec timeout was not set.
// When a timeout is not set, we stop polling the exec session after 5 attempts and allow the process to continue running.
if execTimeout == nil {
count++ count++
if count == 5 { if count == 5 {
klog.Errorf("Exec session %s in container %s terminated but process still running!", execObj.ID, container.ID) klog.Errorf("Exec session %s in container %s terminated but process still running!", execObj.ID, container.ID)
return nil return nil
} }
}
<-ticker.C <-ticker.C
} }