github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move io.go into cio package

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2017-11-17 14:18:30 -05:00
parent bc063f263c
commit 298dabc6c2
13 changed files with 77 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
io.go → cio/io.go
View File

@ -1,4 +1,4 @@
package containerd package cio
import ( import (
"context" "context"
@ -8,8 +8,8 @@ import (
"sync" "sync"
) )
// IOConfig holds the io configurations. // Config holds the io configurations.
type IOConfig struct { type Config struct {
// Terminal is true if one has been allocated // Terminal is true if one has been allocated
Terminal bool Terminal bool
// Stdin path // Stdin path
@ -23,7 +23,7 @@ type IOConfig struct {
// IO holds the io information for a task or process // IO holds the io information for a task or process
type IO interface { type IO interface {
// Config returns the IO configuration. // Config returns the IO configuration.
Config() IOConfig Config() Config
// Cancel aborts all current io operations // Cancel aborts all current io operations
Cancel() Cancel()
// Wait blocks until all io copy operations have completed // Wait blocks until all io copy operations have completed
@ -34,12 +34,12 @@ type IO interface {
// cio is a basic container IO implementation. // cio is a basic container IO implementation.
type cio struct { type cio struct {
config IOConfig config Config
closer *wgCloser closer *wgCloser
} }
func (c *cio) Config() IOConfig { func (c *cio) Config() Config {
return c.config return c.config
} }
@ -64,23 +64,23 @@ func (c *cio) Close() error {
return c.closer.Close() return c.closer.Close()
} }
// IOCreation creates new IO sets for a task // Creation creates new IO sets for a task
type IOCreation func(id string) (IO, error) type Creation func(id string) (IO, error)
// IOAttach allows callers to reattach to running tasks // Attach allows callers to reattach to running tasks
// //
// There should only be one reader for a task's IO set // There should only be one reader for a task's IO set
// because fifo's can only be read from one reader or the output // because fifo's can only be read from one reader or the output
// will be sent only to the first reads // will be sent only to the first reads
type IOAttach func(*FIFOSet) (IO, error) type Attach func(*FIFOSet) (IO, error)
// NewIO returns an IOCreation that will provide IO sets without a terminal // NewIO returns an Creation that will provide IO sets without a terminal
func NewIO(stdin io.Reader, stdout, stderr io.Writer) IOCreation { func NewIO(stdin io.Reader, stdout, stderr io.Writer) Creation {
return NewIOWithTerminal(stdin, stdout, stderr, false) return NewIOWithTerminal(stdin, stdout, stderr, false)
} }
// NewIOWithTerminal creates a new io set with the provied io.Reader/Writers for use with a terminal // NewIOWithTerminal creates a new io set with the provied io.Reader/Writers for use with a terminal
func NewIOWithTerminal(stdin io.Reader, stdout, stderr io.Writer, terminal bool) IOCreation { func NewIOWithTerminal(stdin io.Reader, stdout, stderr io.Writer, terminal bool) Creation {
return func(id string) (_ IO, err error) { return func(id string) (_ IO, err error) {
paths, err := NewFifos(id) paths, err := NewFifos(id)
if err != nil { if err != nil {
@ -91,7 +91,7 @@ func NewIOWithTerminal(stdin io.Reader, stdout, stderr io.Writer, terminal bool)
os.RemoveAll(paths.Dir) os.RemoveAll(paths.Dir)
} }
}() }()
cfg := IOConfig{ cfg := Config{
Terminal: terminal, Terminal: terminal,
Stdout: paths.Out, Stdout: paths.Out,
Stderr: paths.Err, Stderr: paths.Err,
@ -113,12 +113,12 @@ func NewIOWithTerminal(stdin io.Reader, stdout, stderr io.Writer, terminal bool)
} }
// WithAttach attaches the existing io for a task to the provided io.Reader/Writers // WithAttach attaches the existing io for a task to the provided io.Reader/Writers
func WithAttach(stdin io.Reader, stdout, stderr io.Writer) IOAttach { func WithAttach(stdin io.Reader, stdout, stderr io.Writer) Attach {
return func(paths *FIFOSet) (IO, error) { return func(paths *FIFOSet) (IO, error) {
if paths == nil { if paths == nil {
return nil, fmt.Errorf("cannot attach to existing fifos") return nil, fmt.Errorf("cannot attach to existing fifos")
} }
cfg := IOConfig{ cfg := Config{
Terminal: paths.Terminal, Terminal: paths.Terminal,
Stdout: paths.Out, Stdout: paths.Out,
Stderr: paths.Err, Stderr: paths.Err,

8
io_unix.go → cio/io_unix.go
View File

@ -1,6 +1,6 @@
// +build !windows // +build !windows
package containerd package cio
import ( import (
"context" "context"
@ -139,9 +139,9 @@ func (f *DirectIO) IOAttach(set *FIFOSet) (IO, error) {
return f, nil return f, nil
} }
// Config returns the IOConfig // Config returns the Config
func (f *DirectIO) Config() IOConfig { func (f *DirectIO) Config() Config {
return IOConfig{ return Config{
Terminal: f.terminal, Terminal: f.terminal,
Stdin: f.set.In, Stdin: f.set.In,
Stdout: f.set.Out, Stdout: f.set.Out,

2
io_windows.go → cio/io_windows.go
View File

@ -1,4 +1,4 @@
package containerd package cio
import ( import (
"fmt" "fmt"

3
cmd/containerd-stress/main.go
View File

@ -13,6 +13,7 @@ import (
"time" "time"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
@ -206,7 +207,7 @@ func (w *worker) runContainer(ctx context.Context, id string) error {
} }
defer c.Delete(ctx, containerd.WithSnapshotCleanup) defer c.Delete(ctx, containerd.WithSnapshotCleanup)
task, err := c.NewTask(ctx, containerd.NullIO) task, err := c.NewTask(ctx, cio.NullIO)
if err != nil { if err != nil {
return err return err
} }

4
cmd/ctr/commands/tasks/attach.go
View File

@ -4,7 +4,7 @@ import (
"os" "os"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd" "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
@ -39,7 +39,7 @@ var attachCommand = cli.Command{
return err return err
} }
} }
task, err := container.Task(ctx, containerd.WithAttach(os.Stdin, os.Stdout, os.Stderr)) task, err := container.Task(ctx, cio.WithAttach(os.Stdin, os.Stdout, os.Stderr))
if err != nil { if err != nil {
return err return err
} }

8
cmd/ctr/commands/tasks/exec.go
View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd" "github.com/containerd/containerd/cio"
"github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
@ -60,11 +60,11 @@ var execCommand = cli.Command{
pspec.Terminal = tty pspec.Terminal = tty
pspec.Args = args pspec.Args = args
io := containerd.Stdio ioCreator := cio.Stdio
if tty { if tty {
io = containerd.StdioTerminal ioCreator = cio.StdioTerminal
} }
process, err := task.Exec(ctx, context.String("exec-id"), pspec, io) process, err := task.Exec(ctx, context.String("exec-id"), pspec, ioCreator)
if err != nil { if err != nil {
return err return err
} }

11
cmd/ctr/commands/tasks/tasks_unix.go
View File

@ -9,6 +9,7 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
@ -44,21 +45,21 @@ func HandleConsoleResize(ctx gocontext.Context, task resizer, con console.Consol
// NewTask creates a new task // NewTask creates a new task
func NewTask(ctx gocontext.Context, client *containerd.Client, container containerd.Container, checkpoint string, tty, nullIO bool) (containerd.Task, error) { func NewTask(ctx gocontext.Context, client *containerd.Client, container containerd.Container, checkpoint string, tty, nullIO bool) (containerd.Task, error) {
if checkpoint == "" { if checkpoint == "" {
io := containerd.Stdio ioCreator := cio.Stdio
if tty { if tty {
io = containerd.StdioTerminal ioCreator = cio.StdioTerminal
} }
if nullIO { if nullIO {
if tty { if tty {
return nil, errors.New("tty and null-io cannot be used together") return nil, errors.New("tty and null-io cannot be used together")
} }
io = containerd.NullIO ioCreator = cio.NullIO
} }
return container.NewTask(ctx, io) return container.NewTask(ctx, ioCreator)
} }
im, err := client.GetImage(ctx, checkpoint) im, err := client.GetImage(ctx, checkpoint)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return container.NewTask(ctx, containerd.Stdio, containerd.WithTaskCheckpoint(im)) return container.NewTask(ctx, cio.Stdio, containerd.WithTaskCheckpoint(im))
} }

9
cmd/ctr/commands/tasks/tasks_windows.go
View File

@ -6,6 +6,7 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -41,15 +42,15 @@ func HandleConsoleResize(ctx gocontext.Context, task resizer, con console.Consol
// NewTask creates a new task // NewTask creates a new task
func NewTask(ctx gocontext.Context, client *containerd.Client, container containerd.Container, _ string, tty, nullIO bool) (containerd.Task, error) { func NewTask(ctx gocontext.Context, client *containerd.Client, container containerd.Container, _ string, tty, nullIO bool) (containerd.Task, error) {
io := containerd.Stdio ioCreator := cio.Stdio
if tty { if tty {
io = containerd.StdioTerminal ioCreator = cio.StdioTerminal
} }
if nullIO { if nullIO {
if tty { if tty {
return nil, errors.New("tty and null-io cannot be used together") return nil, errors.New("tty and null-io cannot be used together")
} }
io = containerd.NullIO ioCreator = cio.NullIO
} }
return container.NewTask(ctx, io) return container.NewTask(ctx, ioCreator)
} }

19
container.go
View File

@ -8,6 +8,7 @@ import (
"github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/typeurl" "github.com/containerd/typeurl"
@ -25,17 +26,17 @@ type Container interface {
// Delete removes the container // Delete removes the container
Delete(context.Context, ...DeleteOpts) error Delete(context.Context, ...DeleteOpts) error
// NewTask creates a new task based on the container metadata // NewTask creates a new task based on the container metadata
NewTask(context.Context, IOCreation, ...NewTaskOpts) (Task, error) NewTask(context.Context, cio.Creation, ...NewTaskOpts) (Task, error)
// Spec returns the OCI runtime specification // Spec returns the OCI runtime specification
Spec(context.Context) (*specs.Spec, error) Spec(context.Context) (*specs.Spec, error)
// Task returns the current task for the container // Task returns the current task for the container
// //
// If IOAttach options are passed the client will reattach to the IO for the running // If cio.Attach options are passed the client will reattach to the IO for the running
// task. If no task exists for the container a NotFound error is returned // task. If no task exists for the container a NotFound error is returned
// //
// Clients must make sure that only one reader is attached to the task and consuming // Clients must make sure that only one reader is attached to the task and consuming
// the output from the task's fifos // the output from the task's fifos
Task(context.Context, IOAttach) (Task, error) Task(context.Context, cio.Attach) (Task, error)
// Image returns the image that the container is based on // Image returns the image that the container is based on
Image(context.Context) (Image, error) Image(context.Context) (Image, error)
// Labels returns the labels set on the container // Labels returns the labels set on the container
@ -138,7 +139,7 @@ func (c *container) Delete(ctx context.Context, opts ...DeleteOpts) error {
return c.client.ContainerService().Delete(ctx, c.id) return c.client.ContainerService().Delete(ctx, c.id)
} }
func (c *container) Task(ctx context.Context, attach IOAttach) (Task, error) { func (c *container) Task(ctx context.Context, attach cio.Attach) (Task, error) {
return c.loadTask(ctx, attach) return c.loadTask(ctx, attach)
} }
@ -161,7 +162,7 @@ func (c *container) Image(ctx context.Context) (Image, error) {
}, nil }, nil
} }
func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...NewTaskOpts) (Task, error) { func (c *container) NewTask(ctx context.Context, ioCreate cio.Creation, opts ...NewTaskOpts) (Task, error) {
i, err := ioCreate(c.id) i, err := ioCreate(c.id)
if err != nil { if err != nil {
return nil, err return nil, err
@ -251,7 +252,7 @@ func (c *container) Update(ctx context.Context, opts ...UpdateContainerOpts) err
return nil return nil
} }
func (c *container) loadTask(ctx context.Context, ioAttach IOAttach) (Task, error) { func (c *container) loadTask(ctx context.Context, ioAttach cio.Attach) (Task, error) {
response, err := c.client.TaskService().Get(ctx, &tasks.GetRequest{ response, err := c.client.TaskService().Get(ctx, &tasks.GetRequest{
ContainerID: c.id, ContainerID: c.id,
}) })
@ -262,7 +263,7 @@ func (c *container) loadTask(ctx context.Context, ioAttach IOAttach) (Task, erro
} }
return nil, err return nil, err
} }
var i IO var i cio.IO
if ioAttach != nil { if ioAttach != nil {
if i, err = attachExistingIO(response, ioAttach); err != nil { if i, err = attachExistingIO(response, ioAttach); err != nil {
return nil, err return nil, err
@ -281,9 +282,9 @@ func (c *container) get(ctx context.Context) (containers.Container, error) {
return c.client.ContainerService().Get(ctx, c.id) return c.client.ContainerService().Get(ctx, c.id)
} }
func attachExistingIO(response *tasks.GetResponse, ioAttach IOAttach) (IO, error) { func attachExistingIO(response *tasks.GetResponse, ioAttach cio.Attach) (cio.IO, error) {
// get the existing fifo paths from the task information stored by the daemon // get the existing fifo paths from the task information stored by the daemon
paths := &FIFOSet{ paths := &cio.FIFOSet{
Dir: getFifoDir([]string{ Dir: getFifoDir([]string{
response.Process.Stdin, response.Process.Stdin,
response.Process.Stdout, response.Process.Stdout,

15
container_linux_test.go
View File

@ -16,6 +16,7 @@ import (
"time" "time"
"github.com/containerd/cgroups" "github.com/containerd/cgroups"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/linux/runctypes" "github.com/containerd/containerd/linux/runctypes"
@ -294,7 +295,7 @@ func TestContainerAttach(t *testing.T) {
expected := "hello" + newLine expected := "hello" + newLine
direct, err := NewDirectIO(ctx, false) direct, err := cio.NewDirectIO(ctx, false)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -389,7 +390,7 @@ func TestContainerUsername(t *testing.T) {
t.Error(err) t.Error(err)
return return
} }
direct, err := NewDirectIO(ctx, false) direct, err := cio.NewDirectIO(ctx, false)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -482,7 +483,7 @@ func TestContainerAttachProcess(t *testing.T) {
expected := "hello" + newLine expected := "hello" + newLine
// creating IO early for easy resource cleanup // creating IO early for easy resource cleanup
direct, err := NewDirectIO(ctx, false) direct, err := cio.NewDirectIO(ctx, false)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -598,7 +599,7 @@ func TestContainerUserID(t *testing.T) {
t.Error(err) t.Error(err)
return return
} }
direct, err := NewDirectIO(ctx, false) direct, err := cio.NewDirectIO(ctx, false)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -688,7 +689,7 @@ func TestContainerKillAll(t *testing.T) {
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
stdout := bytes.NewBuffer(nil) stdout := bytes.NewBuffer(nil)
task, err := container.NewTask(ctx, NewIO(bytes.NewBuffer(nil), stdout, bytes.NewBuffer(nil))) task, err := container.NewTask(ctx, cio.NewIO(bytes.NewBuffer(nil), stdout, bytes.NewBuffer(nil)))
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -940,7 +941,7 @@ func TestContainerKillInitPidHost(t *testing.T) {
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
stdout := bytes.NewBuffer(nil) stdout := bytes.NewBuffer(nil)
task, err := container.NewTask(ctx, NewIO(bytes.NewBuffer(nil), stdout, bytes.NewBuffer(nil))) task, err := container.NewTask(ctx, cio.NewIO(bytes.NewBuffer(nil), stdout, bytes.NewBuffer(nil)))
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -1039,7 +1040,7 @@ func testUserNamespaces(t *testing.T, readonlyRootFS bool) {
} }
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
task, err := container.NewTask(ctx, Stdio, func(_ context.Context, client *Client, r *TaskInfo) error { task, err := container.NewTask(ctx, cio.Stdio, func(_ context.Context, client *Client, r *TaskInfo) error {
r.Options = &runctypes.CreateOptions{ r.Options = &runctypes.CreateOptions{
IoUid: 1000, IoUid: 1000,
IoGid: 1000, IoGid: 1000,

13
container_test.go
View File

@ -12,6 +12,7 @@ import (
"time" "time"
// Register the typeurl // Register the typeurl
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
_ "github.com/containerd/containerd/runtime" _ "github.com/containerd/containerd/runtime"
"github.com/containerd/typeurl" "github.com/containerd/typeurl"
@ -21,13 +22,13 @@ import (
gogotypes "github.com/gogo/protobuf/types" gogotypes "github.com/gogo/protobuf/types"
) )
func empty() IOCreation { func empty() cio.Creation {
// TODO (@mlaventure) windows searches for pipes // TODO (@mlaventure) windows searches for pipes
// when none are provided // when none are provided
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
return Stdio return cio.Stdio
} }
return NullIO return cio.NullIO
} }
func TestContainerList(t *testing.T) { func TestContainerList(t *testing.T) {
@ -185,7 +186,7 @@ func TestContainerOutput(t *testing.T) {
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
stdout := bytes.NewBuffer(nil) stdout := bytes.NewBuffer(nil)
task, err := container.NewTask(ctx, NewIO(bytes.NewBuffer(nil), stdout, bytes.NewBuffer(nil))) task, err := container.NewTask(ctx, cio.NewIO(bytes.NewBuffer(nil), stdout, bytes.NewBuffer(nil)))
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -445,7 +446,7 @@ func TestContainerCloseIO(t *testing.T) {
return return
} }
task, err := container.NewTask(ctx, NewIO(r, stdout, ioutil.Discard)) task, err := container.NewTask(ctx, cio.NewIO(r, stdout, ioutil.Discard))
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -1054,7 +1055,7 @@ func TestContainerHostname(t *testing.T) {
defer container.Delete(ctx, WithSnapshotCleanup) defer container.Delete(ctx, WithSnapshotCleanup)
stdout := bytes.NewBuffer(nil) stdout := bytes.NewBuffer(nil)
task, err := container.NewTask(ctx, NewIO(bytes.NewBuffer(nil), stdout, bytes.NewBuffer(nil))) task, err := container.NewTask(ctx, cio.NewIO(bytes.NewBuffer(nil), stdout, bytes.NewBuffer(nil)))
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return

7
process.go
View File

@ -7,6 +7,7 @@ import (
"time" "time"
"github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -28,7 +29,7 @@ type Process interface {
// Resize changes the width and heigh of the process's terminal // Resize changes the width and heigh of the process's terminal
Resize(ctx context.Context, w, h uint32) error Resize(ctx context.Context, w, h uint32) error
// IO returns the io set for the process // IO returns the io set for the process
IO() IO IO() cio.IO
// Status returns the executing status of the process // Status returns the executing status of the process
Status(context.Context) (Status, error) Status(context.Context) (Status, error)
} }
@ -72,7 +73,7 @@ type process struct {
id string id string
task *task task *task
pid uint32 pid uint32
io IO io cio.IO
} }
func (p *process) ID() string { func (p *process) ID() string {
@ -154,7 +155,7 @@ func (p *process) CloseIO(ctx context.Context, opts ...IOCloserOpts) error {
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
func (p *process) IO() IO { func (p *process) IO() cio.IO {
return p.io return p.io
} }

15
task.go
View File

@ -14,6 +14,7 @@ import (
"github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types" "github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/diff" "github.com/containerd/containerd/diff"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
@ -123,7 +124,7 @@ type Task interface {
// Resume the execution of the task // Resume the execution of the task
Resume(context.Context) error Resume(context.Context) error
// Exec creates a new process inside the task // Exec creates a new process inside the task
Exec(context.Context, string, *specs.Process, IOCreation) (Process, error) Exec(context.Context, string, *specs.Process, cio.Creation) (Process, error)
// Pids returns a list of system specific process ids inside the task // Pids returns a list of system specific process ids inside the task
Pids(context.Context) ([]ProcessInfo, error) Pids(context.Context) ([]ProcessInfo, error)
// Checkpoint serializes the runtime and memory information of a task into an // Checkpoint serializes the runtime and memory information of a task into an
@ -134,7 +135,7 @@ type Task interface {
// Update modifies executing tasks with updated settings // Update modifies executing tasks with updated settings
Update(context.Context, ...UpdateTaskOpts) error Update(context.Context, ...UpdateTaskOpts) error
// LoadProcess loads a previously created exec'd process // LoadProcess loads a previously created exec'd process
LoadProcess(context.Context, string, IOAttach) (Process, error) LoadProcess(context.Context, string, cio.Attach) (Process, error)
// Metrics returns task metrics for runtime specific metrics // Metrics returns task metrics for runtime specific metrics
// //
// The metric types are generic to containerd and change depending on the runtime // The metric types are generic to containerd and change depending on the runtime
@ -148,7 +149,7 @@ var _ = (Task)(&task{})
type task struct { type task struct {
client *Client client *Client
io IO io cio.IO
id string id string
pid uint32 pid uint32
@ -279,7 +280,7 @@ func (t *task) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (*ExitStat
return &ExitStatus{code: r.ExitStatus, exitedAt: r.ExitedAt}, nil return &ExitStatus{code: r.ExitStatus, exitedAt: r.ExitedAt}, nil
} }
func (t *task) Exec(ctx context.Context, id string, spec *specs.Process, ioCreate IOCreation) (Process, error) { func (t *task) Exec(ctx context.Context, id string, spec *specs.Process, ioCreate cio.Creation) (Process, error) {
if id == "" { if id == "" {
return nil, errors.Wrapf(errdefs.ErrInvalidArgument, "exec id must not be empty") return nil, errors.Wrapf(errdefs.ErrInvalidArgument, "exec id must not be empty")
} }
@ -344,7 +345,7 @@ func (t *task) CloseIO(ctx context.Context, opts ...IOCloserOpts) error {
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
func (t *task) IO() IO { func (t *task) IO() cio.IO {
return t.io return t.io
} }
@ -461,7 +462,7 @@ func (t *task) Update(ctx context.Context, opts ...UpdateTaskOpts) error {
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
func (t *task) LoadProcess(ctx context.Context, id string, ioAttach IOAttach) (Process, error) { func (t *task) LoadProcess(ctx context.Context, id string, ioAttach cio.Attach) (Process, error) {
response, err := t.client.TaskService().Get(ctx, &tasks.GetRequest{ response, err := t.client.TaskService().Get(ctx, &tasks.GetRequest{
ContainerID: t.id, ContainerID: t.id,
ExecID: id, ExecID: id,
@ -473,7 +474,7 @@ func (t *task) LoadProcess(ctx context.Context, id string, ioAttach IOAttach) (P
} }
return nil, err return nil, err
} }
var i IO var i cio.IO
if ioAttach != nil { if ioAttach != nil {
if i, err = attachExistingIO(response, ioAttach); err != nil { if i, err = attachExistingIO(response, ioAttach); err != nil {
return nil, err return nil, err