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

Fix shim delete error code.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2019-10-07 23:21:57 -07:00
parent 2a6d13b2ca
commit 06be794cb2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/v1/shim/service.go
View File

@ -217,7 +217,7 @@ func (s *Service) Delete(ctx context.Context, r *ptypes.Empty) (*shimapi.DeleteR
return nil, err return nil, err
} }
if err := p.Delete(ctx); err != nil { if err := p.Delete(ctx); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
s.mu.Lock() s.mu.Lock()
delete(s.processes, s.id) delete(s.processes, s.id)
@ -240,7 +240,7 @@ func (s *Service) DeleteProcess(ctx context.Context, r *shimapi.DeleteProcessReq
return nil, err return nil, err
} }
if err := p.Delete(ctx); err != nil { if err := p.Delete(ctx); err != nil {
return nil, err return nil, errdefs.ToGRPC(err)
} }
s.mu.Lock() s.mu.Lock()
delete(s.processes, r.ID) delete(s.processes, r.ID)