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

linux, linux/shim: remove error definitions

Browse Source 
Since we now have a common set of error definitions, mapped to existing
error codes, we no longer need the specialized error codes used for
interaction with linux processes. The main issue was that string
matching was being used to map these to useful error codes. With this
change, we use errors defined in the `errdefs` package, which map
cleanly to GRPC error codes and are recoverable on either side of the
request.

The main focus of this PR was in removin these from the shim. We may
need follow ups to ensure error codes are preserved by the `Tasks`
service.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2017-07-18 15:41:05 -07:00
parent 6d305c741e
commit 6d0bcd5aec
12 changed files with 82 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
linux/task.go
View File

@@ -5,14 +5,12 @@ package linux
import (
"context"
"google.golang.org/grpc"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
client "github.com/containerd/containerd/linux/shim"
shim "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/runtime"
"github.com/gogo/protobuf/types"
"github.com/pkg/errors"
)
type Task struct {
@@ -44,7 +42,7 @@ func (t *Task) Info() runtime.TaskInfo {
func (t *Task) Start(ctx context.Context) error {
_, err := t.shim.Start(ctx, empty)
if err != nil {
err = errors.New(grpc.ErrorDesc(err))
err = errdefs.FromGRPC(err)
}
return err
}
@@ -54,7 +52,7 @@ func (t *Task) State(ctx context.Context) (runtime.State, error) {
ID: t.id,
})
if err != nil {
return runtime.State{}, errors.New(grpc.ErrorDesc(err))
return runtime.State{}, errdefs.FromGRPC(err)
}
var status runtime.Status
switch response.Status {
@@ -81,7 +79,7 @@ func (t *Task) State(ctx context.Context) (runtime.State, error) {
func (t *Task) Pause(ctx context.Context) error {
_, err := t.shim.Pause(ctx, empty)
if err != nil {
err = errors.New(grpc.ErrorDesc(err))
err = errdefs.FromGRPC(err)
}
return err
}
@@ -89,7 +87,7 @@ func (t *Task) Pause(ctx context.Context) error {
func (t *Task) Resume(ctx context.Context) error {
_, err := t.shim.Resume(ctx, empty)
if err != nil {
err = errors.New(grpc.ErrorDesc(err))
err = errdefs.FromGRPC(err)
}
return err
}
@@ -101,7 +99,7 @@ func (t *Task) Kill(ctx context.Context, signal uint32, all bool) error {
All: all,
})
if err != nil {
err = errors.New(grpc.ErrorDesc(err))
return errdefs.FromGRPC(err)
}
return err
}
@@ -116,7 +114,7 @@ func (t *Task) Exec(ctx context.Context, id string, opts runtime.ExecOpts) (runt
Spec: opts.Spec,
}
if _, err := t.shim.Exec(ctx, request); err != nil {
return nil, errors.New(grpc.ErrorDesc(err))
return nil, errdefs.FromGRPC(err)
}
return &Process{
id: id,
@@ -130,7 +128,7 @@ func (t *Task) Pids(ctx context.Context) ([]uint32, error) {
ID: t.id,
})
if err != nil {
return nil, errors.New(grpc.ErrorDesc(err))
return nil, errdefs.FromGRPC(err)
}
return resp.Pids, nil
}
@@ -142,7 +140,7 @@ func (t *Task) ResizePty(ctx context.Context, size runtime.ConsoleSize) error {
Height: size.Height,
})
if err != nil {
err = errors.New(grpc.ErrorDesc(err))
err = errdefs.FromGRPC(err)
}
return err
}
@@ -153,7 +151,7 @@ func (t *Task) CloseIO(ctx context.Context) error {
Stdin: true,
})
if err != nil {
err = errors.New(grpc.ErrorDesc(err))
err = errdefs.FromGRPC(err)
}
return err
}
@@ -164,7 +162,7 @@ func (t *Task) Checkpoint(ctx context.Context, path string, options *types.Any)
Options: options,
}
if _, err := t.shim.Checkpoint(ctx, r); err != nil {
return errors.New(grpc.ErrorDesc(err))
return errdefs.FromGRPC(err)
}
return nil
}
@@ -174,7 +172,7 @@ func (t *Task) DeleteProcess(ctx context.Context, id string) (*runtime.Exit, err
ID: id,
})
if err != nil {
return nil, errors.New(grpc.ErrorDesc(err))
return nil, errdefs.FromGRPC(err)
}
return &runtime.Exit{
Status: r.ExitStatus,