Merge pull request #3733 from Random-Liu/cherrypick-#3730-release-1.3

dmcgowan · web-flow · commit ea86733a5660 · 2019-10-08T16:15:00.000-07:00
[release/1.3] Fix shim delete error code.
diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
@@ -217,7 +217,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)
@@ -240,7 +240,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
`@@ -217,7 +217,7 @@ func (s Service) Delete(ctx context.Context, r ptypes.Empty) (*shimapi.DeleteR`
`217`	`217`	`return nil, err`
`218`	`218`	`}`
`219`	`219`	`if err := p.Delete(ctx); err != nil {`
`220`		`- return nil, err`
	`220`	`+ return nil, errdefs.ToGRPC(err)`
`221`	`221`	`}`
`222`	`222`	`s.mu.Lock()`
`223`	`223`	`delete(s.processes, s.id)`
`@@ -240,7 +240,7 @@ func (s Service) DeleteProcess(ctx context.Context, r shimapi.DeleteProcessReq`
`240`	`240`	`return nil, err`
`241`	`241`	`}`
`242`	`242`	`if err := p.Delete(ctx); err != nil {`
`243`		`- return nil, err`
	`243`	`+ return nil, errdefs.ToGRPC(err)`
`244`	`244`	`}`
`245`	`245`	`s.mu.Lock()`
`246`	`246`	`delete(s.processes, r.ID)`