From fa15c87cf073a4ef4f59911e4d20571fba4d0ece Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Wed, 2 Nov 2016 15:08:21 -0700 Subject: [PATCH] Cleanup leaking goroutine --- pkg/kubelet/dockershim/docker_streaming.go | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkg/kubelet/dockershim/docker_streaming.go b/pkg/kubelet/dockershim/docker_streaming.go index da1d0a6e249..68771ff04c6 100644 --- a/pkg/kubelet/dockershim/docker_streaming.go +++ b/pkg/kubelet/dockershim/docker_streaming.go @@ -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 {