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

Merge pull request #1470 from crosbymichael/lossy

Browse Source 
Return grpc errs from task service
This commit is contained in:
Phil Estes 2017-09-05 17:15:38 -04:00 committed by GitHub
commit 16fcb8dc08
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux/task.go
View File

@ -186,10 +186,12 @@ func (t *Task) DeleteProcess(ctx context.Context, id string) (*runtime.Exit, err
} }
func (t *Task) Update(ctx context.Context, resources *types.Any) error { func (t *Task) Update(ctx context.Context, resources *types.Any) error {
_, err := t.shim.Update(ctx, &shim.UpdateTaskRequest{ if _, err := t.shim.Update(ctx, &shim.UpdateTaskRequest{
Resources: resources, Resources: resources,
}) }); err != nil {
return err return errdefs.FromGRPC(err)
}
return nil
} }
func (t *Task) Process(ctx context.Context, id string) (runtime.Process, error) { func (t *Task) Process(ctx context.Context, id string) (runtime.Process, error) {

43
services/tasks/service.go
View File

@ -24,7 +24,6 @@ import (
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime"
google_protobuf "github.com/golang/protobuf/ptypes/empty" google_protobuf "github.com/golang/protobuf/ptypes/empty"
"github.com/pkg/errors"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
@ -139,7 +138,7 @@ func (s *Service) Create(ctx context.Context, r *api.CreateTaskRequest) (*api.Cr
} }
c, err := runtime.Create(ctx, r.ContainerID, opts) c, err := runtime.Create(ctx, r.ContainerID, opts)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "runtime create failed") return nil, errdefs.ToGRPC(err)
} }
state, err := c.State(ctx) state, err := c.State(ctx)
if err != nil { if err != nil {
@ -160,15 +159,15 @@ func (s *Service) Start(ctx context.Context, r *api.StartRequest) (*api.StartRes
p := runtime.Process(t) p := runtime.Process(t)
if r.ExecID != "" { if r.ExecID != "" {
if p, err = t.Process(ctx, r.ExecID); err != nil { if p, err = t.Process(ctx, r.ExecID); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
} }
if err := p.Start(ctx); err != nil { if err := p.Start(ctx); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
state, err := p.State(ctx) state, err := p.State(ctx)
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return &api.StartResponse{ return &api.StartResponse{
Pid: state.Pid, Pid: state.Pid,
@ -186,7 +185,7 @@ func (s *Service) Delete(ctx context.Context, r *api.DeleteTaskRequest) (*api.De
} }
exit, err := runtime.Delete(ctx, t) exit, err := runtime.Delete(ctx, t)
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return &api.DeleteResponse{ return &api.DeleteResponse{
ExitStatus: exit.Status, ExitStatus: exit.Status,
@ -202,7 +201,7 @@ func (s *Service) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest
} }
exit, err := t.DeleteProcess(ctx, r.ExecID) exit, err := t.DeleteProcess(ctx, r.ExecID)
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return &api.DeleteResponse{ return &api.DeleteResponse{
ID: r.ExecID, ID: r.ExecID,
@ -215,7 +214,7 @@ func (s *Service) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest
func processFromContainerd(ctx context.Context, p runtime.Process) (*task.Process, error) { func processFromContainerd(ctx context.Context, p runtime.Process) (*task.Process, error) {
state, err := p.State(ctx) state, err := p.State(ctx)
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
var status task.Status var status task.Status
switch state.Status { switch state.Status {
@ -253,7 +252,7 @@ func (s *Service) Get(ctx context.Context, r *api.GetRequest) (*api.GetResponse,
p := runtime.Process(task) p := runtime.Process(task)
if r.ExecID != "" { if r.ExecID != "" {
if p, err = task.Process(ctx, r.ExecID); err != nil { if p, err = task.Process(ctx, r.ExecID); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
} }
t, err := processFromContainerd(ctx, p) t, err := processFromContainerd(ctx, p)
@ -270,7 +269,7 @@ func (s *Service) List(ctx context.Context, r *api.ListTasksRequest) (*api.ListT
for _, r := range s.runtimes { for _, r := range s.runtimes {
tasks, err := r.Tasks(ctx) tasks, err := r.Tasks(ctx)
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
for _, t := range tasks { for _, t := range tasks {
tt, err := processFromContainerd(ctx, t) tt, err := processFromContainerd(ctx, t)
@ -290,7 +289,7 @@ func (s *Service) Pause(ctx context.Context, r *api.PauseTaskRequest) (*google_p
} }
err = t.Pause(ctx) err = t.Pause(ctx)
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return empty, nil return empty, nil
} }
@ -302,7 +301,7 @@ func (s *Service) Resume(ctx context.Context, r *api.ResumeTaskRequest) (*google
} }
err = t.Resume(ctx) err = t.Resume(ctx)
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return empty, nil return empty, nil
} }
@ -315,7 +314,7 @@ func (s *Service) Kill(ctx context.Context, r *api.KillRequest) (*google_protobu
p := runtime.Process(t) p := runtime.Process(t)
if r.ExecID != "" { if r.ExecID != "" {
if p, err = t.Process(ctx, r.ExecID); err != nil { if p, err = t.Process(ctx, r.ExecID); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
} }
if err := p.Kill(ctx, r.Signal, r.All); err != nil { if err := p.Kill(ctx, r.Signal, r.All); err != nil {
@ -331,7 +330,7 @@ func (s *Service) ListPids(ctx context.Context, r *api.ListPidsRequest) (*api.Li
} }
pids, err := t.Pids(ctx) pids, err := t.Pids(ctx)
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return &api.ListPidsResponse{ return &api.ListPidsResponse{
Pids: pids, Pids: pids,
@ -355,7 +354,7 @@ func (s *Service) Exec(ctx context.Context, r *api.ExecProcessRequest) (*google_
Terminal: r.Terminal, Terminal: r.Terminal,
}, },
}); err != nil { }); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return empty, nil return empty, nil
} }
@ -368,14 +367,14 @@ func (s *Service) ResizePty(ctx context.Context, r *api.ResizePtyRequest) (*goog
p := runtime.Process(t) p := runtime.Process(t)
if r.ExecID != "" { if r.ExecID != "" {
if p, err = t.Process(ctx, r.ExecID); err != nil { if p, err = t.Process(ctx, r.ExecID); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
} }
if err := p.ResizePty(ctx, runtime.ConsoleSize{ if err := p.ResizePty(ctx, runtime.ConsoleSize{
Width: r.Width, Width: r.Width,
Height: r.Height, Height: r.Height,
}); err != nil { }); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return empty, nil return empty, nil
} }
@ -388,7 +387,7 @@ func (s *Service) CloseIO(ctx context.Context, r *api.CloseIORequest) (*google_p
p := runtime.Process(t) p := runtime.Process(t)
if r.ExecID != "" { if r.ExecID != "" {
if p, err = t.Process(ctx, r.ExecID); err != nil { if p, err = t.Process(ctx, r.ExecID); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
} }
if r.Stdin { if r.Stdin {
@ -410,11 +409,11 @@ func (s *Service) Checkpoint(ctx context.Context, r *api.CheckpointTaskRequest)
} }
image, err := ioutil.TempDir("", "ctd-checkpoint") image, err := ioutil.TempDir("", "ctd-checkpoint")
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
defer os.RemoveAll(image) defer os.RemoveAll(image)
if err := t.Checkpoint(ctx, image, r.Options); err != nil { if err := t.Checkpoint(ctx, image, r.Options); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
// write checkpoint to the content store // write checkpoint to the content store
tar := archive.Diff(ctx, "", image) tar := archive.Diff(ctx, "", image)
@ -434,7 +433,7 @@ func (s *Service) Checkpoint(ctx context.Context, r *api.CheckpointTaskRequest)
spec := bytes.NewReader(data) spec := bytes.NewReader(data)
specD, err := s.writeContent(ctx, images.MediaTypeContainerd1CheckpointConfig, filepath.Join(image, "spec"), spec) specD, err := s.writeContent(ctx, images.MediaTypeContainerd1CheckpointConfig, filepath.Join(image, "spec"), spec)
if err != nil { if err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return &api.CheckpointTaskResponse{ return &api.CheckpointTaskResponse{
Descriptors: []*types.Descriptor{ Descriptors: []*types.Descriptor{
@ -450,7 +449,7 @@ func (s *Service) Update(ctx context.Context, r *api.UpdateTaskRequest) (*google
return nil, err return nil, err
} }
if err := t.Update(ctx, r.Resources); err != nil { if err := t.Update(ctx, r.Resources); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
return empty, nil return empty, nil
} }