Call CloseIO when stdin closes in ctr

crosbymichael · estesp · commit 116e770a8aa7 · 2019-08-05T15:47:43.000-04:00
Fixes #2439 Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
diff --git a/cmd/ctr/commands/tasks/exec.go b/cmd/ctr/commands/tasks/exec.go
@@ -18,8 +18,11 @@ package tasks
 
 import (
 	"errors"
+	"io"
+	"os"
 
 	"github.com/containerd/console"
+	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/cmd/ctr/commands"
 	"github.com/sirupsen/logrus"
@@ -80,7 +83,12 @@ var execCommand = cli.Command{
 		pspec.Terminal = tty
 		pspec.Args = args
 
-		cioOpts := []cio.Opt{cio.WithStdio, cio.WithFIFODir(context.String("fifo-dir"))}
+		var (
+			stdinC = &stdinCloser{
+				stdin: os.Stdin,
+			}
+		)
+		cioOpts := []cio.Opt{cio.WithStreams(stdinC, os.Stdout, os.Stderr), cio.WithFIFODir(context.String("fifo-dir"))}
 		if tty {
 			cioOpts = append(cioOpts, cio.WithTerminal)
 		}
@@ -89,6 +97,9 @@ var execCommand = cli.Command{
 		if err != nil {
 			return err
 		}
+		stdinC.closer = func() {
+			process.CloseIO(ctx, containerd.WithStdinCloser)
+		}
 		defer process.Delete(ctx)
 
 		statusC, err := process.Wait(ctx)
@@ -127,3 +138,18 @@ var execCommand = cli.Command{
 		return nil
 	},
 }
+
+type stdinCloser struct {
+	stdin  *os.File
+	closer func()
+}
+
+func (s *stdinCloser) Read(p []byte) (int, error) {
+	n, err := s.stdin.Read(p)
+	if err == io.EOF {
+		if s.closer != nil {
+			s.closer()
+		}
+	}
+	return n, err
+}
diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go
@@ -68,7 +68,10 @@ func HandleConsoleResize(ctx gocontext.Context, task resizer, con console.Consol
 
 // NewTask creates a new task
 func NewTask(ctx gocontext.Context, client *containerd.Client, container containerd.Container, checkpoint string, con console.Console, nullIO bool, ioOpts []cio.Opt, opts ...containerd.NewTaskOpts) (containerd.Task, error) {
-	stdio := cio.NewCreator(append([]cio.Opt{cio.WithStdio}, ioOpts...)...)
+	stdinC := &stdinCloser{
+		stdin: os.Stdin,
+	}
+	stdio := cio.NewCreator(append([]cio.Opt{cio.WithStreams(stdinC, os.Stdout, os.Stderr)}, ioOpts...)...)
 	if checkpoint != "" {
 		im, err := client.GetImage(ctx, checkpoint)
 		if err != nil {
@@ -86,7 +89,14 @@ func NewTask(ctx gocontext.Context, client *containerd.Client, container contain
 		}
 		ioCreator = cio.NullIO
 	}
-	return container.NewTask(ctx, ioCreator, opts...)
+	t, err := container.NewTask(ctx, ioCreator, opts...)
+	if err != nil {
+		return nil, err
+	}
+	stdinC.closer = func() {
+		t.CloseIO(ctx, containerd.WithStdinCloser)
+	}
+	return t, nil
 }
 
 func getNewTaskOpts(context *cli.Context) []containerd.NewTaskOpts {
