Merge pull request #3264 from Random-Liu/cherry-pick-#3244-#3263-release-1.2

estesp · web-flow · commit ea75cfc1582d · 2019-05-08T12:58:12.000+02:00
[release/1.2] Return NotFound error for kill and delete in deleted state.
diff --git a/runtime/v1/linux/proc/deleted_state.go b/runtime/v1/linux/proc/deleted_state.go
@@ -22,6 +22,7 @@ import (
 	"context"
 
 	"github.com/containerd/console"
+	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/runtime/proc"
 	google_protobuf "github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
@@ -55,11 +56,11 @@ func (s *deletedState) Start(ctx context.Context) error {
 }
 
 func (s *deletedState) Delete(ctx context.Context) error {
-	return errors.Errorf("cannot delete a deleted process")
+	return errors.Wrap(errdefs.ErrNotFound, "cannot delete a deleted process")
 }
 
 func (s *deletedState) Kill(ctx context.Context, sig uint32, all bool) error {
-	return errors.Errorf("cannot kill a deleted process")
+	return errors.Wrap(errdefs.ErrNotFound, "cannot kill a deleted process")
 }
 
 func (s *deletedState) SetExited(status int) {
diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go
@@ -87,7 +87,7 @@ func (t *Task) Namespace() string {
 // Delete the task and return the exit status
 func (t *Task) Delete(ctx context.Context) (*runtime.Exit, error) {
 	rsp, err := t.shim.Delete(ctx, empty)
-	if err != nil {
+	if err != nil && !errdefs.IsNotFound(err) {
 		return nil, errdefs.FromGRPC(err)
 	}
 	t.tasks.Delete(ctx, t.id)
diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go
@@ -150,7 +150,7 @@ func (s *shim) Delete(ctx context.Context) (*runtime.Exit, error) {
 	response, err := s.task.Delete(ctx, &task.DeleteRequest{
 		ID: s.ID(),
 	})
-	if err != nil {
+	if err != nil && !errdefs.IsNotFound(err) {
 		return nil, errdefs.FromGRPC(err)
 	}
 	if err := s.waitShutdown(ctx); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import (`
`22`	`22`	`"context"`
`23`	`23`
`24`	`24`	`"github.com/containerd/console"`
	`25`	`+ "github.com/containerd/containerd/errdefs"`
`25`	`26`	`"github.com/containerd/containerd/runtime/proc"`
`26`	`27`	`google_protobuf "github.com/gogo/protobuf/types"`
`27`	`28`	`"github.com/pkg/errors"`
`@@ -55,11 +56,11 @@ func (s *deletedState) Start(ctx context.Context) error {`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`func (s *deletedState) Delete(ctx context.Context) error {`
`58`		`- return errors.Errorf("cannot delete a deleted process")`
	`59`	`+ return errors.Wrap(errdefs.ErrNotFound, "cannot delete a deleted process")`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`func (s *deletedState) Kill(ctx context.Context, sig uint32, all bool) error {`
`62`		`- return errors.Errorf("cannot kill a deleted process")`
	`63`	`+ return errors.Wrap(errdefs.ErrNotFound, "cannot kill a deleted process")`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`func (s *deletedState) SetExited(status int) {`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (t *Task) Namespace() string {`
`87`	`87`	`// Delete the task and return the exit status`
`88`	`88`	`func (t Task) Delete(ctx context.Context) (runtime.Exit, error) {`
`89`	`89`	`rsp, err := t.shim.Delete(ctx, empty)`
`90`		`- if err != nil {`
	`90`	`+ if err != nil && !errdefs.IsNotFound(err) {`
`91`	`91`	`return nil, errdefs.FromGRPC(err)`
`92`	`92`	`}`
`93`	`93`	`t.tasks.Delete(ctx, t.id)`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func (s shim) Delete(ctx context.Context) (runtime.Exit, error) {`
`150`	`150`	`response, err := s.task.Delete(ctx, &task.DeleteRequest{`
`151`	`151`	`ID: s.ID(),`
`152`	`152`	`})`
`153`		`- if err != nil {`
	`153`	`+ if err != nil && !errdefs.IsNotFound(err) {`
`154`	`154`	`return nil, errdefs.FromGRPC(err)`
`155`	`155`	`}`
`156`	`156`	`if err := s.waitShutdown(ctx); err != nil {`