Merge pull request #3739 from estesp/cp-1.2-3736

crosbymichael · web-flow · commit c3532a35ccca · 2019-10-09T13:38:45.000-04:00
[release/1.2] backport: Fix delete error code on the containerd daemon side.
diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go
@@ -86,9 +86,12 @@ 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 && !errdefs.IsNotFound(err) {
-		return nil, errdefs.FromGRPC(err)
+	rsp, shimErr := t.shim.Delete(ctx, empty)
+	if shimErr != nil {
+		shimErr = errdefs.FromGRPC(shimErr)
+		if !errdefs.IsNotFound(shimErr) {
+			return nil, shimErr
+		}
 	}
 	t.tasks.Delete(ctx, t.id)
 	if err := t.shim.KillShim(ctx); err != nil {
@@ -97,6 +100,9 @@ func (t *Task) Delete(ctx context.Context) (*runtime.Exit, error) {
 	if err := t.bundle.Delete(); err != nil {
 		log.G(ctx).WithError(err).Error("failed to delete bundle")
 	}
+	if shimErr != nil {
+		return nil, shimErr
+	}
 	t.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventstypes.TaskDelete{
 		ContainerID: t.id,
 		ExitStatus:  rsp.ExitStatus,
diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go
@@ -147,11 +147,14 @@ func (s *shim) Close() error {
 }
 
 func (s *shim) Delete(ctx context.Context) (*runtime.Exit, error) {
-	response, err := s.task.Delete(ctx, &task.DeleteRequest{
+	response, shimErr := s.task.Delete(ctx, &task.DeleteRequest{
 		ID: s.ID(),
 	})
-	if err != nil && !errdefs.IsNotFound(err) {
-		return nil, errdefs.FromGRPC(err)
+	if shimErr != nil {
+		shimErr = errdefs.FromGRPC(shimErr)
+		if !errdefs.IsNotFound(shimErr) {
+			return nil, shimErr
+		}
 	}
 	if err := s.waitShutdown(ctx); err != nil {
 		return nil, err
@@ -162,6 +165,11 @@ func (s *shim) Delete(ctx context.Context) (*runtime.Exit, error) {
 	// remove self from the runtime task list
 	// this seems dirty but it cleans up the API across runtimes, tasks, and the service
 	s.rtTasks.Delete(ctx, s.ID())
+
+	if shimErr != nil {
+		return nil, shimErr
+	}
+
 	s.events.Publish(ctx, runtime.TaskDeleteEventTopic, &eventstypes.TaskDelete{
 		ContainerID: s.ID(),
 		ExitStatus:  response.ExitStatus,
diff --git a/services/tasks/local.go b/services/tasks/local.go
@@ -229,7 +229,7 @@ func (l *local) Delete(ctx context.Context, r *api.DeleteTaskRequest, _ ...grpc.
 	}
 	exit, err := t.Delete(ctx)
 	if err != nil {
-		return nil, err
+		return nil, errdefs.ToGRPC(err)
 	}
 	return &api.DeleteResponse{
 		ExitStatus: exit.Status,
@@ -245,7 +245,7 @@ func (l *local) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest,
 	}
 	process, err := t.Process(ctx, r.ExecID)
 	if err != nil {
-		return nil, err
+		return nil, errdefs.ToGRPC(err)
 	}
 	exit, err := process.Delete(ctx)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ func (l local) Delete(ctx context.Context, r api.DeleteTaskRequest, _ ...grpc.`
`229`	`229`	`}`
`230`	`230`	`exit, err := t.Delete(ctx)`
`231`	`231`	`if err != nil {`
`232`		`- return nil, err`
	`232`	`+ return nil, errdefs.ToGRPC(err)`
`233`	`233`	`}`
`234`	`234`	`return &api.DeleteResponse{`
`235`	`235`	`ExitStatus: exit.Status,`
`@@ -245,7 +245,7 @@ func (l local) DeleteProcess(ctx context.Context, r api.DeleteProcessRequest,`
`245`	`245`	`}`
`246`	`246`	`process, err := t.Process(ctx, r.ExecID)`
`247`	`247`	`if err != nil {`
`248`		`- return nil, err`
	`248`	`+ return nil, errdefs.ToGRPC(err)`
`249`	`249`	`}`
`250`	`250`	`exit, err := process.Delete(ctx)`
`251`	`251`	`if err != nil {`