github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36100 from timstclair/cris-leak

Browse Source 
Automatic merge from submit-queue

Cleanup leaking goroutine

Cleanup potential go-routine leak in ExecSync path by removing timeout support. Timeout support is added in https://github.com/kubernetes/kubernetes/pull/33366 and https://github.com/kubernetes/kubernetes/pull/35893, and until those merge this is consistent with current behavior.

/cc @rhcarvalho
This commit is contained in:
Kubernetes Submit Queue
2016-11-05 16:52:46 -07:00
committed by GitHub
parent afa99c68b8 fa15c87cf0
commit 37e3074d3e
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 return err
} }
// TODO(timstclair): Clean this up once PR#33366 merges. // TODO(timstclair): Add timeout once PR#33366 merges.
if timeout <= 0 { return r.execHandler.ExecInContainer(r.client, container, cmd, in, out, errw, tty, resize)
// 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)
}
} }
func (r *streamingRuntime) Attach(containerID string, in io.Reader, out, errw io.WriteCloser, resize <-chan term.Size) error { func (r *streamingRuntime) Attach(containerID string, in io.Reader, out, errw io.WriteCloser, resize <-chan term.Size) error {