Fixes containerd-shim-runhcs Delete on exec id

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
containerd · Sep 27, 2018 · 83437ef · 83437ef
1 parent 84aa0bf
commit 83437ef
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/runtime/v2/runhcs/service.go b/runtime/v2/runhcs/service.go
@@ -486,13 +486,15 @@ func (s *service) Delete(ctx context.Context, r *taskAPI.DeleteRequest) (*taskAP
 		return nil, err
 	}
 
-	rhs := newRunhcs(p.bundle)
-
-	dopts := &runhcs.DeleteOpts{
-		Force: true,
-	}
-	if err := rhs.Delete(ctx, p.id, dopts); err != nil {
-		return nil, errors.Wrapf(err, "failed to delete container: %s", p.id)
+	// This is a container
+	if p.cid == p.id {
+		rhs := newRunhcs(p.bundle)
+		dopts := &runhcs.DeleteOpts{
+			Force: true,
+		}
+		if err := rhs.Delete(ctx, p.id, dopts); err != nil {
+			return nil, errors.Wrapf(err, "failed to delete container: %s", p.id)
+		}
 	}
 
 	select {