scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 02:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup leaking goroutine

Browse Source
This commit is contained in:
Tim St. Clair
2016-11-02 15:08:21 -07:00
parent 7747f5eefd
commit fa15c87cf0
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/kubelet/dockershim/docker_streaming.go
View File

@@ -49,23 +49,8 @@ func (r *streamingRuntime) exec(containerID string, cmd []string, in io.Reader,
return err
}
// TODO(timstclair): Clean this up once PR#33366 merges.
if timeout <= 0 {
// Run until command exits.
return r.execHandler.ExecInContainer(r.client, container, cmd, in, out, errw, tty, resize)
}
errCh := make(chan error)
go func() {
errCh <- r.execHandler.ExecInContainer(r.client, container, cmd, in, out, errw, tty, resize)
}()
select {
case err := <-errCh:
return err
case <-time.After(timeout):
return streaming.ErrorTimeout("exec", timeout)
}
// TODO(timstclair): Add timeout once PR#33366 merges.
return r.execHandler.ExecInContainer(r.client, container, cmd, in, out, errw, tty, resize)
}
func (r *streamingRuntime) Attach(containerID string, in io.Reader, out, errw io.WriteCloser, resize <-chan term.Size) error {