Don't delete containers when ExecID is non-empty

Non-empty Exec ID means deleting the task, not its container.

Signed-off-by: Kazuyoshi Kato <[email protected]>

Author: Kazuyoshi Kato

runtime/service.go

@@ -787,17 +787,23 @@ func (s *service) Delete(requestCtx context.Context, req *taskAPI.DeleteRequest)
 		return nil, err
 	}
 
+	if req.ExecID != "" {
+		return resp, nil
+	}
+
+	// Delete the container
 	dir, err := s.shimDir.BundleLink(req.ID)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to find the bundle directory of the container: %s", req.ID)
 	}
 
 	_, err = os.Stat(dir.RootPath())
 	if os.IsNotExist(err) {
-		// is this really bad?
-		logger.Warnf("failed to delete %s: %v", dir.RootPath(), err)
-	} else if err = os.Remove(dir.RootPath()); err != nil {
-		return nil, errors.Wrapf(err, "failed to remove the bundle directory of the container: %s", req.ID)
+		return nil, errors.Wrapf(err, "failed to find the bundle directory of the container: %s", dir.RootPath())
+	}
+
+	if err = os.Remove(dir.RootPath()); err != nil {
+		return nil, errors.Wrapf(err, "failed to remove the bundle directory of the container: %s", dir.RootPath())
 	}
 
 	return resp, nil

runtime/service_integ_test.go

@@ -572,8 +572,7 @@ func testCreateContainerWithSameName(t *testing.T, vmID string) {
 	pluginClient, err := ttrpcutil.NewClient(containerdSockPath + ".ttrpc")
 	require.NoError(t, err, "failed to create ttrpc client")
 
-	// Explicitly specify Container Count = 2
-	// TODO: shouldn't it work without specifying the count?
+	// Explicitly specify Container Count = 2 to workaround #230
 	if len(vmID) != 0 {
 		fcClient := fccontrol.NewFirecrackerClient(pluginClient.Client())
 		_, err = fcClient.CreateVM(ctx, &proto.CreateVMRequest{