Fix container exec

Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-10 18:34:59 +00:00
parent e41b6d3c24
commit 3557cffbbb
2 changed files with 185 additions and 16 deletions
--- a/pkg/server/io/exec_io.go
+++ b/pkg/server/io/exec_io.go
@@ -0,0 +1,152 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io
+
+import (
+	"io"
+	"os"
+	"sync"
+
+	"github.com/containerd/containerd"
+	"github.com/golang/glog"
+
+	cioutil "github.com/kubernetes-incubator/cri-containerd/pkg/ioutil"
+)
+
+// ExecIO holds the exec io.
+type ExecIO struct {
+	id    string
+	fifos *containerd.FIFOSet
+	*stdioPipes
+	closer *wgCloser
+}
+
+var _ containerd.IO = &ExecIO{}
+
+// NewExecIO creates exec io.
+func NewExecIO(id, root string, tty, stdin bool) (*ExecIO, error) {
+	fifos, err := newFifos(root, id, tty, stdin)
+	if err != nil {
+		return nil, err
+	}
+	stdio, closer, err := newStdioPipes(fifos)
+	if err != nil {
+		return nil, err
+	}
+	return &ExecIO{
+		id:         id,
+		fifos:      fifos,
+		stdioPipes: stdio,
+		closer:     closer,
+	}, nil
+}
+
+// Config returns io config.
+func (e *ExecIO) Config() containerd.IOConfig {
+	return containerd.IOConfig{
+		Terminal: e.fifos.Terminal,
+		Stdin:    e.fifos.In,
+		Stdout:   e.fifos.Out,
+		Stderr:   e.fifos.Err,
+	}
+}
+
+// Attach attaches exec stdio. The logic is similar with container io attach.
+func (e *ExecIO) Attach(opts AttachOptions) <-chan struct{} {
+	var wg sync.WaitGroup
+	var stdinStreamRC io.ReadCloser
+	if e.stdin != nil && opts.Stdin != nil {
+		stdinStreamRC = cioutil.NewWrapReadCloser(opts.Stdin)
+		wg.Add(1)
+		go func() {
+			if _, err := io.Copy(e.stdin, stdinStreamRC); err != nil {
+				glog.Errorf("Failed to redirect stdin for container exec %q: %v", e.id, err)
+			}
+			glog.V(2).Infof("Container exec %q stdin closed", e.id)
+			if opts.StdinOnce && !opts.Tty {
+				e.stdin.Close()
+				if err := opts.CloseStdin(); err != nil {
+					glog.Errorf("Failed to close stdin for container exec %q: %v", e.id, err)
+				}
+			} else {
+				if e.stdout != nil {
+					e.stdout.Close()
+				}
+				if e.stderr != nil {
+					e.stderr.Close()
+				}
+			}
+			wg.Done()
+		}()
+	}
+
+	attachOutput := func(t StreamType, stream io.WriteCloser, out io.ReadCloser) {
+		if _, err := io.Copy(stream, out); err != nil {
+			glog.Errorf("Failed to pipe %q for container exec %q: %v", t, e.id, err)
+		}
+		out.Close()
+		stream.Close()
+		if stdinStreamRC != nil {
+			stdinStreamRC.Close()
+		}
+		e.closer.wg.Done()
+		wg.Done()
+		glog.V(2).Infof("Finish piping %q of container exec %q", t, e.id)
+	}
+
+	if opts.Stdout != nil {
+		wg.Add(1)
+		// Closer should wait for this routine to be over.
+		e.closer.wg.Add(1)
+		go attachOutput(Stdout, opts.Stdout, e.stdout)
+	}
+
+	if !opts.Tty && opts.Stderr != nil {
+		wg.Add(1)
+		// Closer should wait for this routine to be over.
+		e.closer.wg.Add(1)
+		go attachOutput(Stderr, opts.Stderr, e.stderr)
+	}
+
+	done := make(chan struct{})
+	go func() {
+		wg.Wait()
+		close(done)
+	}()
+	return done
+}
+
+// Cancel cancels exec io.
+func (e *ExecIO) Cancel() {
+	e.closer.Cancel()
+}
+
+// Wait waits exec io to finish.
+func (e *ExecIO) Wait() {
+	e.closer.Wait()
+}
+
+// Close closes all FIFOs.
+func (e *ExecIO) Close() error {
+	if e.closer != nil {
+		e.closer.Close()
+	}
+	if e.fifos != nil {
+		return os.RemoveAll(e.fifos.Dir)
+	}
+	return nil
+}