Merge pull request #2422 from crosbymichael/ctr-delete

crosbymichael · web-flow · commit ca204317ed49 · 2018-06-27T08:46:18.000-04:00
Add cio.Load for loading io set
diff --git a/cio/io.go b/cio/io.go
@@ -255,3 +255,14 @@ func (l *logIO) Wait() {
 func (l *logIO) Close() error {
 	return nil
 }
+
+// Load the io for a container but do not attach
+//
+// Allows io to be loaded on the task for deletion without
+// starting copy routines
+func Load(set *FIFOSet) (IO, error) {
+	return &cio{
+		config:  set.Config,
+		closers: []io.Closer{set},
+	}, nil
+}
diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go
@@ -25,6 +25,7 @@ import (
 	"text/tabwriter"
 
 	"github.com/containerd/containerd"
+	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/cmd/ctr/commands"
 	"github.com/containerd/containerd/cmd/ctr/commands/run"
 	"github.com/containerd/containerd/log"
@@ -162,7 +163,6 @@ var deleteCommand = cli.Command{
 				log.G(ctx).WithError(err).Errorf("failed to delete container %q", arg)
 			}
 		}
-
 		return exitErr
 	},
 }
@@ -172,7 +172,7 @@ func deleteContainer(ctx context.Context, client *containerd.Client, id string,
 	if err != nil {
 		return err
 	}
-	task, err := container.Task(ctx, nil)
+	task, err := container.Task(ctx, cio.Load)
 	if err != nil {
 		return container.Delete(ctx, opts...)
 	}
diff --git a/cmd/ctr/commands/tasks/delete.go b/cmd/ctr/commands/tasks/delete.go
@@ -18,6 +18,7 @@ package tasks
 
 import (
 	"github.com/containerd/containerd"
+	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/cmd/ctr/commands"
 	"github.com/urfave/cli"
 )
@@ -42,8 +43,7 @@ var deleteCommand = cli.Command{
 		if err != nil {
 			return err
 		}
-
-		task, err := container.Task(ctx, nil)
+		task, err := container.Task(ctx, cio.Load)
 		if err != nil {
 			return err
 		}
diff --git a/container.go b/container.go
@@ -307,6 +307,12 @@ func (c *container) get(ctx context.Context) (containers.Container, error) {
 
 // get the existing fifo paths from the task information stored by the daemon
 func attachExistingIO(response *tasks.GetResponse, ioAttach cio.Attach) (cio.IO, error) {
+	fifoSet := loadFifos(response)
+	return ioAttach(fifoSet)
+}
+
+// loadFifos loads the containers fifos
+func loadFifos(response *tasks.GetResponse) *cio.FIFOSet {
 	path := getFifoDir([]string{
 		response.Process.Stdin,
 		response.Process.Stdout,
@@ -315,13 +321,12 @@ func attachExistingIO(response *tasks.GetResponse, ioAttach cio.Attach) (cio.IO,
 	closer := func() error {
 		return os.RemoveAll(path)
 	}
-	fifoSet := cio.NewFIFOSet(cio.Config{
+	return cio.NewFIFOSet(cio.Config{
 		Stdin:    response.Process.Stdin,
 		Stdout:   response.Process.Stdout,
 		Stderr:   response.Process.Stderr,
 		Terminal: response.Process.Terminal,
 	}, closer)
-	return ioAttach(fifoSet)
 }
 
 // getFifoDir looks for any non-empty path for a stdio fifo

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`	`"text/tabwriter"`
`26`	`26`
`27`	`27`	`"github.com/containerd/containerd"`
	`28`	`+ "github.com/containerd/containerd/cio"`
`28`	`29`	`"github.com/containerd/containerd/cmd/ctr/commands"`
`29`	`30`	`"github.com/containerd/containerd/cmd/ctr/commands/run"`
`30`	`31`	`"github.com/containerd/containerd/log"`
`@@ -162,7 +163,6 @@ var deleteCommand = cli.Command{`
`162`	`163`	`log.G(ctx).WithError(err).Errorf("failed to delete container %q", arg)`
`163`	`164`	`}`
`164`	`165`	`}`
`165`		`-`
`166`	`166`	`return exitErr`
`167`	`167`	`},`
`168`	`168`	`}`
`@@ -172,7 +172,7 @@ func deleteContainer(ctx context.Context, client *containerd.Client, id string,`
`172`	`172`	`if err != nil {`
`173`	`173`	`return err`
`174`	`174`	`}`
`175`		`- task, err := container.Task(ctx, nil)`
	`175`	`+ task, err := container.Task(ctx, cio.Load)`
`176`	`176`	`if err != nil {`
`177`	`177`	`return container.Delete(ctx, opts...)`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package tasks`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"github.com/containerd/containerd"`
	`21`	`+ "github.com/containerd/containerd/cio"`
`21`	`22`	`"github.com/containerd/containerd/cmd/ctr/commands"`
`22`	`23`	`"github.com/urfave/cli"`
`23`	`24`	`)`
`@@ -42,8 +43,7 @@ var deleteCommand = cli.Command{`
`42`	`43`	`if err != nil {`
`43`	`44`	`return err`
`44`	`45`	`}`
`45`		`-`
`46`		`- task, err := container.Task(ctx, nil)`
	`46`	`+ task, err := container.Task(ctx, cio.Load)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return err`
`49`	`49`	`}`