Merge pull request #1047 from crosbymichael/rename-to-tasks

Rename execution service to tasks

client.go

@@ -14,10 +14,10 @@ import (
 	contentapi "github.com/containerd/containerd/api/services/content"
 	diffapi "github.com/containerd/containerd/api/services/diff"
 	eventsapi "github.com/containerd/containerd/api/services/events"
-	"github.com/containerd/containerd/api/services/execution"
 	imagesapi "github.com/containerd/containerd/api/services/images"
 	namespacesapi "github.com/containerd/containerd/api/services/namespaces"
 	snapshotapi "github.com/containerd/containerd/api/services/snapshot"
+	"github.com/containerd/containerd/api/services/tasks"
 	versionservice "github.com/containerd/containerd/api/services/version"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/images"
@@ -456,8 +456,8 @@ func (c *Client) SnapshotService() snapshot.Snapshotter {
 	return snapshotservice.NewSnapshotterFromClient(snapshotapi.NewSnapshotsClient(c.conn))
 }
 
-func (c *Client) TaskService() execution.TasksClient {
-	return execution.NewTasksClient(c.conn)
+func (c *Client) TaskService() tasks.TasksClient {
+	return tasks.NewTasksClient(c.conn)
 }
 
 func (c *Client) ImageService() images.Store {

cmd/containerd/builtins.go

@@ -7,10 +7,10 @@ import (
 	_ "github.com/containerd/containerd/services/content"
 	_ "github.com/containerd/containerd/services/diff"
 	_ "github.com/containerd/containerd/services/events"
-	_ "github.com/containerd/containerd/services/execution"
 	_ "github.com/containerd/containerd/services/healthcheck"
 	_ "github.com/containerd/containerd/services/images"
 	_ "github.com/containerd/containerd/services/namespaces"
 	_ "github.com/containerd/containerd/services/snapshot"
+	_ "github.com/containerd/containerd/services/tasks"
 	_ "github.com/containerd/containerd/services/version"
 )

cmd/containerd/main.go

@@ -21,10 +21,10 @@ import (
 	containersapi "github.com/containerd/containerd/api/services/containers"
 	contentapi "github.com/containerd/containerd/api/services/content"
 	diffapi "github.com/containerd/containerd/api/services/diff"
-	api "github.com/containerd/containerd/api/services/execution"
 	imagesapi "github.com/containerd/containerd/api/services/images"
 	namespacesapi "github.com/containerd/containerd/api/services/namespaces"
 	snapshotapi "github.com/containerd/containerd/api/services/snapshot"
+	api "github.com/containerd/containerd/api/services/tasks"
 	versionapi "github.com/containerd/containerd/api/services/version"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/events"

cmd/ctr/run_windows.go

@@ -12,7 +12,7 @@ import (
 	"github.com/containerd/console"
 	"github.com/containerd/containerd"
 	containersapi "github.com/containerd/containerd/api/services/containers"
-	"github.com/containerd/containerd/api/services/execution"
+	"github.com/containerd/containerd/api/services/tasks"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/windows"
@@ -160,8 +160,8 @@ func newCreateContainerRequest(context *cli.Context, id, snapshot, image string,
 	return create, nil
 }
 
-func newCreateTaskRequest(context *cli.Context, id, tmpDir string, checkpoint *ocispec.Descriptor, mounts []mount.Mount) (*execution.CreateTaskRequest, error) {
-	create := &execution.CreateTaskRequest{
+func newCreateTaskRequest(context *cli.Context, id, tmpDir string, checkpoint *ocispec.Descriptor, mounts []mount.Mount) (*tasks.CreateTaskRequest, error) {
+	create := &tasks.CreateTaskRequest{
 		ContainerID: id,
 		Terminal:    context.Bool("tty"),
 		Stdin:       fmt.Sprintf(`%s\ctr-%s-stdin`, pipeRoot, id),

cmd/ctr/utils.go

@@ -16,10 +16,10 @@ import (
 	contentapi "github.com/containerd/containerd/api/services/content"
 	diffapi "github.com/containerd/containerd/api/services/diff"
 	"github.com/containerd/containerd/api/services/events"
-	"github.com/containerd/containerd/api/services/execution"
 	imagesapi "github.com/containerd/containerd/api/services/images"
 	namespacesapi "github.com/containerd/containerd/api/services/namespaces"
 	snapshotapi "github.com/containerd/containerd/api/services/snapshot"
+	"github.com/containerd/containerd/api/services/tasks"
 	versionservice "github.com/containerd/containerd/api/services/version"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/images"
@@ -81,12 +81,12 @@ func getContainersService(context *cli.Context) (containersapi.ContainersClient,
 	return containersapi.NewContainersClient(conn), nil
 }
 
-func getTasksService(context *cli.Context) (execution.TasksClient, error) {
+func getTasksService(context *cli.Context) (tasks.TasksClient, error) {
 	conn, err := getGRPCConnection(context)
 	if err != nil {
 		return nil, err
 	}
-	return execution.NewTasksClient(conn), nil
+	return tasks.NewTasksClient(conn), nil
 }
 
 func getEventsService(context *cli.Context) (events.EventsClient, error) {

container.go

@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc/codes"
 
 	"github.com/containerd/containerd/api/services/containers"
-	"github.com/containerd/containerd/api/services/execution"
+	"github.com/containerd/containerd/api/services/tasks"
 	"github.com/containerd/containerd/api/types/mount"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
@@ -104,7 +104,7 @@ func (c *container) Image(ctx context.Context) (Image, error) {
 	}, nil
 }
 
-type NewTaskOpts func(context.Context, *Client, *execution.CreateTaskRequest) error
+type NewTaskOpts func(context.Context, *Client, *tasks.CreateTaskRequest) error
 
 func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...NewTaskOpts) (Task, error) {
 	c.mu.Lock()
@@ -113,7 +113,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...Ne
 	if err != nil {
 		return nil, err
 	}
-	request := &execution.CreateTaskRequest{
+	request := &tasks.CreateTaskRequest{
 		ContainerID: c.c.ID,
 		Terminal:    i.Terminal,
 		Stdin:       i.Stdin,
@@ -161,7 +161,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...Ne
 }
 
 func (c *container) loadTask(ctx context.Context, ioAttach IOAttach) (Task, error) {
-	response, err := c.client.TaskService().Get(ctx, &execution.GetTaskRequest{
+	response, err := c.client.TaskService().Get(ctx, &tasks.GetTaskRequest{
 		ContainerID: c.c.ID,
 	})
 	if err != nil {

container_unix.go

@@ -9,7 +9,7 @@ import (
 	"io/ioutil"
 
 	"github.com/containerd/containerd/api/services/containers"
-	"github.com/containerd/containerd/api/services/execution"
+	"github.com/containerd/containerd/api/services/tasks"
 	"github.com/containerd/containerd/api/types/descriptor"
 	"github.com/containerd/containerd/content"
 	"github.com/containerd/containerd/images"
@@ -83,7 +83,7 @@ func WithCheckpoint(desc v1.Descriptor, rootfsID string) NewContainerOpts {
 }
 
 func WithTaskCheckpoint(desc v1.Descriptor) NewTaskOpts {
-	return func(ctx context.Context, c *Client, r *execution.CreateTaskRequest) error {
+	return func(ctx context.Context, c *Client, r *tasks.CreateTaskRequest) error {
 		id := desc.Digest
 		index, err := decodeIndex(ctx, c.ContentStore(), id)
 		if err != nil {

process.go

@@ -6,7 +6,7 @@ import (
 	"syscall"
 
 	eventsapi "github.com/containerd/containerd/api/services/events"
-	"github.com/containerd/containerd/api/services/execution"
+	"github.com/containerd/containerd/api/services/tasks"
 	"github.com/containerd/containerd/api/types/event"
 	tasktypes "github.com/containerd/containerd/api/types/task"
 	"github.com/gogo/protobuf/proto"
@@ -41,7 +41,7 @@ func (p *process) Start(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	request := &execution.ExecProcessRequest{
+	request := &tasks.ExecProcessRequest{
 		ContainerID: p.task.containerID,
 		Terminal:    p.io.Terminal,
 		Stdin:       p.io.Stdin,
@@ -62,10 +62,10 @@ func (p *process) Start(ctx context.Context) error {
 }
 
 func (p *process) Kill(ctx context.Context, s syscall.Signal) error {
-	_, err := p.task.client.TaskService().Kill(ctx, &execution.KillRequest{
+	_, err := p.task.client.TaskService().Kill(ctx, &tasks.KillRequest{
 		Signal:      uint32(s),
 		ContainerID: p.task.containerID,
-		PidOrAll: &execution.KillRequest_Pid{
+		PidOrAll: &tasks.KillRequest_Pid{
 			Pid: p.pid,
 		},
 	})
@@ -102,7 +102,7 @@ func (p *process) Wait(ctx context.Context) (uint32, error) {
 }
 
 func (p *process) CloseIO(ctx context.Context, opts ...IOCloserOpts) error {
-	r := &execution.CloseIORequest{
+	r := &tasks.CloseIORequest{
 		ContainerID: p.task.containerID,
 		Pid:         p.pid,
 	}
@@ -118,7 +118,7 @@ func (p *process) IO() *IO {
 }
 
 func (p *process) Resize(ctx context.Context, w, h uint32) error {
-	_, err := p.task.client.TaskService().ResizePty(ctx, &execution.ResizePtyRequest{
+	_, err := p.task.client.TaskService().ResizePty(ctx, &tasks.ResizePtyRequest{
 		ContainerID: p.task.containerID,
 		Width:       w,
 		Height:      h,
@@ -129,7 +129,7 @@ func (p *process) Resize(ctx context.Context, w, h uint32) error {
 
 func (p *process) Delete(ctx context.Context) (uint32, error) {
 	cerr := p.io.Close()
-	r, err := p.task.client.TaskService().DeleteProcess(ctx, &execution.DeleteProcessRequest{
+	r, err := p.task.client.TaskService().DeleteProcess(ctx, &tasks.DeleteProcessRequest{
 		ContainerID: p.task.containerID,
 		Pid:         p.pid,
 	})

services/tasks/service.go

@@ -1,4 +1,4 @@
-package execution
+package tasks
 
 import (
 	"bytes"
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 
 	"github.com/boltdb/bolt"
-	api "github.com/containerd/containerd/api/services/execution"
+	api "github.com/containerd/containerd/api/services/tasks"
 	"github.com/containerd/containerd/api/types/descriptor"
 	"github.com/containerd/containerd/api/types/event"
 	"github.com/containerd/containerd/api/types/task"

task.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/containerd/containerd/api/services/containers"
 	eventsapi "github.com/containerd/containerd/api/services/events"
-	"github.com/containerd/containerd/api/services/execution"
+	"github.com/containerd/containerd/api/services/tasks"
 	"github.com/containerd/containerd/api/types/event"
 	tasktypes "github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/content"
@@ -34,13 +34,13 @@ const (
 	Pausing TaskStatus = "pausing"
 )
 
-type IOCloserOpts func(*execution.CloseIORequest)
+type IOCloserOpts func(*tasks.CloseIORequest)
 
-func WithStdinCloser(r *execution.CloseIORequest) {
+func WithStdinCloser(r *tasks.CloseIORequest) {
 	r.Stdin = true
 }
 
-type CheckpointOpts func(*execution.CheckpointTaskRequest) error
+type CheckpointOpts func(*tasks.CheckpointTaskRequest) error
 
 type Task interface {
 	Pid() uint32
@@ -79,7 +79,7 @@ type task struct {
 	containerID string
 	pid         uint32
 
-	deferred *execution.CreateTaskRequest
+	deferred *tasks.CreateTaskRequest
 	pidSync  chan struct{}
 }
 
@@ -99,17 +99,17 @@ func (t *task) Start(ctx context.Context) error {
 		close(t.pidSync)
 		return nil
 	}
-	_, err := t.client.TaskService().Start(ctx, &execution.StartTaskRequest{
+	_, err := t.client.TaskService().Start(ctx, &tasks.StartTaskRequest{
 		ContainerID: t.containerID,
 	})
 	return err
 }
 
 func (t *task) Kill(ctx context.Context, s syscall.Signal) error {
-	_, err := t.client.TaskService().Kill(ctx, &execution.KillRequest{
+	_, err := t.client.TaskService().Kill(ctx, &tasks.KillRequest{
 		Signal:      uint32(s),
 		ContainerID: t.containerID,
-		PidOrAll: &execution.KillRequest_All{
+		PidOrAll: &tasks.KillRequest_All{
 			All: true,
 		},
 	})
@@ -117,21 +117,21 @@ func (t *task) Kill(ctx context.Context, s syscall.Signal) error {
 }
 
 func (t *task) Pause(ctx context.Context) error {
-	_, err := t.client.TaskService().Pause(ctx, &execution.PauseTaskRequest{
+	_, err := t.client.TaskService().Pause(ctx, &tasks.PauseTaskRequest{
 		ContainerID: t.containerID,
 	})
 	return err
 }
 
 func (t *task) Resume(ctx context.Context) error {
-	_, err := t.client.TaskService().Resume(ctx, &execution.ResumeTaskRequest{
+	_, err := t.client.TaskService().Resume(ctx, &tasks.ResumeTaskRequest{
 		ContainerID: t.containerID,
 	})
 	return err
 }
 
 func (t *task) Status(ctx context.Context) (TaskStatus, error) {
-	r, err := t.client.TaskService().Get(ctx, &execution.GetTaskRequest{
+	r, err := t.client.TaskService().Get(ctx, &tasks.GetTaskRequest{
 		ContainerID: t.containerID,
 	})
 	if err != nil {
@@ -178,7 +178,7 @@ func (t *task) Delete(ctx context.Context) (uint32, error) {
 	if t.io != nil {
 		cerr = t.io.Close()
 	}
-	r, err := t.client.TaskService().Delete(ctx, &execution.DeleteTaskRequest{
+	r, err := t.client.TaskService().Delete(ctx, &tasks.DeleteTaskRequest{
 		ContainerID: t.containerID,
 	})
 	if err != nil {
@@ -201,7 +201,7 @@ func (t *task) Exec(ctx context.Context, spec *specs.Process, ioCreate IOCreatio
 }
 
 func (t *task) Processes(ctx context.Context) ([]uint32, error) {
-	response, err := t.client.TaskService().ListProcesses(ctx, &execution.ListProcessesRequest{
+	response, err := t.client.TaskService().ListProcesses(ctx, &tasks.ListProcessesRequest{
 		ContainerID: t.containerID,
 	})
 	if err != nil {
@@ -215,7 +215,7 @@ func (t *task) Processes(ctx context.Context) ([]uint32, error) {
 }
 
 func (t *task) CloseIO(ctx context.Context, opts ...IOCloserOpts) error {
-	r := &execution.CloseIORequest{
+	r := &tasks.CloseIORequest{
 		ContainerID: t.containerID,
 		Pid:         t.pid,
 	}
@@ -231,7 +231,7 @@ func (t *task) IO() *IO {
 }
 
 func (t *task) Resize(ctx context.Context, w, h uint32) error {
-	_, err := t.client.TaskService().ResizePty(ctx, &execution.ResizePtyRequest{
+	_, err := t.client.TaskService().ResizePty(ctx, &tasks.ResizePtyRequest{
 		ContainerID: t.containerID,
 		Width:       w,
 		Height:      h,
@@ -240,13 +240,13 @@ func (t *task) Resize(ctx context.Context, w, h uint32) error {
 	return err
 }
 
-func WithExit(r *execution.CheckpointTaskRequest) error {
+func WithExit(r *tasks.CheckpointTaskRequest) error {
 	r.Options["exit"] = "true"
 	return nil
 }
 
 func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointOpts) (d v1.Descriptor, err error) {
-	request := &execution.CheckpointTaskRequest{
+	request := &tasks.CheckpointTaskRequest{
 		ContainerID: t.containerID,
 		Options:     make(map[string]string),
 	}
@@ -281,7 +281,7 @@ func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointOpts) (d v1.Des
 	return t.writeIndex(ctx, &index)
 }
 
-func (t *task) checkpointTask(ctx context.Context, index *v1.Index, request *execution.CheckpointTaskRequest) error {
+func (t *task) checkpointTask(ctx context.Context, index *v1.Index, request *tasks.CheckpointTaskRequest) error {
 	response, err := t.client.TaskService().Checkpoint(ctx, request)
 	if err != nil {
 		return err