Reproduce the VM re-use issue

We are not deleting the files associated with a container correctly,
as #65 suggested.

The existing test didn't unveil the issue since the shim is deleting
the files along with the files associated with the shim.

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

Author: kzys

runtime/service.go

@@ -785,6 +785,15 @@ func (s *service) Delete(requestCtx context.Context, req *taskAPI.DeleteRequest)
 		return nil, err
 	}
 
+	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)
+	}
+
+	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 resp, nil
 }
 

runtime/service_integ_test.go

@@ -562,10 +562,9 @@ func startAndWaitTask(ctx context.Context, t *testing.T, c containerd.Container)
 	return stdout.String()
 }
 
-func TestCreateContainerWithSameName_Isolated(t *testing.T) {
-	internal.RequiresIsolation(t)
-
+func testCreateContainerWithSameName(t *testing.T, opts ...oci.SpecOpts) {
 	ctx := namespaces.WithNamespace(context.Background(), "default")
+	withNewSpec := containerd.WithNewSpec(append([]oci.SpecOpts{oci.WithProcessArgs("echo", "hello")}, opts...)...)
 
 	client, err := containerd.New(containerdSockPath, containerd.WithDefaultRuntime(firecrackerRuntime))
 	require.NoError(t, err, "unable to create client to containerd service at %s, is containerd running?", containerdSockPath)
@@ -583,7 +582,7 @@ func TestCreateContainerWithSameName_Isolated(t *testing.T) {
 		containerName,
 		containerd.WithSnapshotter(naiveSnapshotterName),
 		containerd.WithNewSnapshot(snapshotName, image),
-		containerd.WithNewSpec(oci.WithProcessArgs("echo", "hello")),
+		withNewSpec,
 	)
 	require.NoError(t, err, "failed to create container %s", containerName)
 	require.Equal(t, "hello\n", startAndWaitTask(ctx, t, c1))
@@ -600,7 +599,7 @@ func TestCreateContainerWithSameName_Isolated(t *testing.T) {
 		containerName,
 		containerd.WithSnapshotter(naiveSnapshotterName),
 		containerd.WithNewSnapshot(snapshotName, image),
-		containerd.WithNewSpec(oci.WithProcessArgs("echo", "hello")),
+		withNewSpec,
 	)
 	require.NoError(t, err, "failed to create container %s", containerName)
 	require.Equal(t, "hello\n", startAndWaitTask(ctx, t, c2))
@@ -611,3 +610,10 @@ func TestCreateContainerWithSameName_Isolated(t *testing.T) {
 	_, err = os.Stat(containerPath)
 	require.True(t, os.IsNotExist(err))
 }
+
+func TestCreateContainerWithSameName_Isolated(t *testing.T) {
+	internal.RequiresIsolation(t)
+
+	testCreateContainerWithSameName(t)
+	testCreateContainerWithSameName(t, firecrackeroci.WithVMID("reuse-same-vm"))
+}