Merge pull request #3732 from Random-Liu/cherrypick-#3730-release-1.2

dmcgowan · web-flow · commit 445638104e99 · 2019-10-08T16:14:29.000-07:00
[release/1.2] Fix shim delete error code.
diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
@@ -214,7 +214,7 @@ func (s *Service) Delete(ctx context.Context, r *ptypes.Empty) (*shimapi.DeleteR
 		return nil, err
 	}
 	if err := p.Delete(ctx); err != nil {
-		return nil, err
+		return nil, errdefs.ToGRPC(err)
 	}
 	s.mu.Lock()
 	delete(s.processes, s.id)
@@ -237,7 +237,7 @@ func (s *Service) DeleteProcess(ctx context.Context, r *shimapi.DeleteProcessReq
 		return nil, err
 	}
 	if err := p.Delete(ctx); err != nil {
-		return nil, err
+		return nil, errdefs.ToGRPC(err)
 	}
 	s.mu.Lock()
 	delete(s.processes, r.ID)

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func (s Service) Delete(ctx context.Context, r ptypes.Empty) (*shimapi.DeleteR`
`214`	`214`	`return nil, err`
`215`	`215`	`}`
`216`	`216`	`if err := p.Delete(ctx); err != nil {`
`217`		`- return nil, err`
	`217`	`+ return nil, errdefs.ToGRPC(err)`
`218`	`218`	`}`
`219`	`219`	`s.mu.Lock()`
`220`	`220`	`delete(s.processes, s.id)`
`@@ -237,7 +237,7 @@ func (s Service) DeleteProcess(ctx context.Context, r shimapi.DeleteProcessReq`
`237`	`237`	`return nil, err`
`238`	`238`	`}`
`239`	`239`	`if err := p.Delete(ctx); err != nil {`
`240`		`- return nil, err`
	`240`	`+ return nil, errdefs.ToGRPC(err)`
`241`	`241`	`}`
`242`	`242`	`s.mu.Lock()`
`243`	`243`	`delete(s.processes, r.ID)`