Merge pull request #3265 from Random-Liu/cherry-pick-#3244-#3263-release-1.1

estesp · web-flow · commit dde4c10719d9 · 2019-05-08T12:58:45.000+02:00
[release/1.1] Return NotFound error for kill and delete in deleted state.
diff --git a/linux/proc/deleted_state.go b/linux/proc/deleted_state.go
@@ -22,6 +22,7 @@ import (
 	"context"
 
 	"github.com/containerd/console"
+	"github.com/containerd/containerd/errdefs"
 	google_protobuf "github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
 )
@@ -54,11 +55,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/linux/runtime.go b/linux/runtime.go
@@ -320,7 +320,7 @@ func (r *Runtime) Delete(ctx context.Context, c runtime.Task) (*runtime.Exit, er
 	)
 
 	rsp, err := lc.shim.Delete(ctx, empty)
-	if err != nil {
+	if err != nil && !errdefs.IsNotFound(err) {
 		if cerr := r.cleanupAfterDeadShim(ctx, bundle, namespace, c.ID(), lc.pid); cerr != nil {
 			log.G(ctx).WithError(err).Error("unable to cleanup task")
 		}

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`	`google_protobuf "github.com/gogo/protobuf/types"`
`26`	`27`	`"github.com/pkg/errors"`
`27`	`28`	`)`
`@@ -54,11 +55,11 @@ func (s *deletedState) Start(ctx context.Context) error {`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`func (s *deletedState) Delete(ctx context.Context) error {`
`57`		`- return errors.Errorf("cannot delete a deleted process")`
	`58`	`+ return errors.Wrap(errdefs.ErrNotFound, "cannot delete a deleted process")`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`func (s *deletedState) Kill(ctx context.Context, sig uint32, all bool) error {`
`61`		`- return errors.Errorf("cannot kill a deleted process")`
	`62`	`+ return errors.Wrap(errdefs.ErrNotFound, "cannot kill a deleted process")`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`func (s *deletedState) SetExited(status int) {`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ func (r Runtime) Delete(ctx context.Context, c runtime.Task) (runtime.Exit, er`
`320`	`320`	`)`
`321`	`321`
`322`	`322`	`rsp, err := lc.shim.Delete(ctx, empty)`
`323`		`- if err != nil {`
	`323`	`+ if err != nil && !errdefs.IsNotFound(err) {`
`324`	`324`	`if cerr := r.cleanupAfterDeadShim(ctx, bundle, namespace, c.ID(), lc.pid); cerr != nil {`
`325`	`325`	`log.G(ctx).WithError(err).Error("unable to cleanup task")`
`326`	`326`	`}`