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

Merge pull request #1386 from Random-Liu/task-service-grpc-error

Browse Source 
Convert errors returned by task service to errdefs error.
This commit is contained in:
Stephen Day 2017-08-17 16:04:12 -07:00 committed by GitHub
commit a29c6c7ab9
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container.go
View File

@ -221,7 +221,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...Ne
} else { } else {
response, err := c.client.TaskService().Create(ctx, request) response, err := c.client.TaskService().Create(ctx, request)
if err != nil { if err != nil {
return nil, err return nil, errdefs.FromGRPC(err)
} }
t.pid = response.Pid t.pid = response.Pid
} }

10
process.go
View File

@ -64,7 +64,7 @@ func (p *process) Start(ctx context.Context) error {
p.io.Cancel() p.io.Cancel()
p.io.Wait() p.io.Wait()
p.io.Close() p.io.Close()
return err return errdefs.FromGRPC(err)
} }
p.pid = r.Pid p.pid = r.Pid
return nil return nil
@ -76,7 +76,7 @@ func (p *process) Kill(ctx context.Context, s syscall.Signal) error {
ContainerID: p.task.id, ContainerID: p.task.id,
ExecID: p.id, ExecID: p.id,
}) })
return err return errdefs.FromGRPC(err)
} }
func (p *process) Wait(ctx context.Context) (uint32, error) { func (p *process) Wait(ctx context.Context) (uint32, error) {
@ -125,7 +125,7 @@ func (p *process) CloseIO(ctx context.Context, opts ...IOCloserOpts) error {
} }
r.Stdin = i.Stdin r.Stdin = i.Stdin
_, err := p.task.client.TaskService().CloseIO(ctx, r) _, err := p.task.client.TaskService().CloseIO(ctx, r)
return err return errdefs.FromGRPC(err)
} }
func (p *process) IO() IO { func (p *process) IO() IO {
@ -139,7 +139,7 @@ func (p *process) Resize(ctx context.Context, w, h uint32) error {
Height: h, Height: h,
ExecID: p.id, ExecID: p.id,
}) })
return err return errdefs.FromGRPC(err)
} }
func (p *process) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (uint32, error) { func (p *process) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (uint32, error) {
@ -164,7 +164,7 @@ func (p *process) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (uint32
ExecID: p.id, ExecID: p.id,
}) })
if err != nil { if err != nil {
return UnknownExitStatus, err return UnknownExitStatus, errdefs.FromGRPC(err)
} }
return r.ExitStatus, nil return r.ExitStatus, nil
} }

18
task.go
View File

@ -145,7 +145,7 @@ func (t *task) Start(ctx context.Context) error {
t.mu.Unlock() t.mu.Unlock()
if err != nil { if err != nil {
t.io.Close() t.io.Close()
return err return errdefs.FromGRPC(err)
} }
t.pid = response.Pid t.pid = response.Pid
return nil return nil
@ -156,7 +156,7 @@ func (t *task) Start(ctx context.Context) error {
if err != nil { if err != nil {
t.io.Close() t.io.Close()
} }
return err return errdefs.FromGRPC(err)
} }
func (t *task) Kill(ctx context.Context, s syscall.Signal) error { func (t *task) Kill(ctx context.Context, s syscall.Signal) error {
@ -270,7 +270,7 @@ func (t *task) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (uint32, e
ContainerID: t.id, ContainerID: t.id,
}) })
if err != nil { if err != nil {
return UnknownExitStatus, err return UnknownExitStatus, errdefs.FromGRPC(err)
} }
return r.ExitStatus, nil return r.ExitStatus, nil
} }
@ -301,7 +301,7 @@ func (t *task) Exec(ctx context.Context, id string, spec *specs.Process, ioCreat
i.Cancel() i.Cancel()
i.Wait() i.Wait()
i.Close() i.Close()
return nil, err return nil, errdefs.FromGRPC(err)
} }
return &process{ return &process{
id: id, id: id,
@ -316,7 +316,7 @@ func (t *task) Pids(ctx context.Context) ([]uint32, error) {
ContainerID: t.id, ContainerID: t.id,
}) })
if err != nil { if err != nil {
return nil, err return nil, errdefs.FromGRPC(err)
} }
return response.Pids, nil return response.Pids, nil
} }
@ -331,7 +331,7 @@ func (t *task) CloseIO(ctx context.Context, opts ...IOCloserOpts) error {
} }
r.Stdin = i.Stdin r.Stdin = i.Stdin
_, err := t.client.TaskService().CloseIO(ctx, r) _, err := t.client.TaskService().CloseIO(ctx, r)
return err return errdefs.FromGRPC(err)
} }
func (t *task) IO() IO { func (t *task) IO() IO {
@ -344,7 +344,7 @@ func (t *task) Resize(ctx context.Context, w, h uint32) error {
Width: w, Width: w,
Height: h, Height: h,
}) })
return err return errdefs.FromGRPC(err)
} }
func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (d v1.Descriptor, err error) { func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (d v1.Descriptor, err error) {
@ -416,13 +416,13 @@ func (t *task) Update(ctx context.Context, opts ...UpdateTaskOpts) error {
request.Resources = any request.Resources = any
} }
_, err := t.client.TaskService().Update(ctx, request) _, err := t.client.TaskService().Update(ctx, request)
return err return errdefs.FromGRPC(err)
} }
func (t *task) checkpointTask(ctx context.Context, index *v1.Index, request *tasks.CheckpointTaskRequest) error { func (t *task) checkpointTask(ctx context.Context, index *v1.Index, request *tasks.CheckpointTaskRequest) error {
response, err := t.client.TaskService().Checkpoint(ctx, request) response, err := t.client.TaskService().Checkpoint(ctx, request)
if err != nil { if err != nil {
return err return errdefs.FromGRPC(err)
} }
// add the checkpoint descriptors to the index // add the checkpoint descriptors to the index
for _, d := range response.Descriptors { for _, d := range response.Descriptors {