move resume VM outside create snapshot

Author: amohoste

cri/firecracker/coordinator.go

@@ -313,6 +313,8 @@ func (c *coordinator) orchCreateSnapshot(ctx context.Context, funcInst *FuncInst
 		return nil
 	}
 
+	_, err = c.orch.ResumeVM(ctx, funcInst.vmID)
+
 	if err := c.snapshotManager.CommitSnapshot(id); err != nil {
 		funcInst.logger.WithError(err).Error("failed to commit snapshot")
 		return err

ctriface/iface.go

@@ -475,12 +475,6 @@ func (o *Orchestrator) CreateSnapshot(ctx context.Context, vmID string, snap *sn
 		return err
 	}
 
-	// 5. Resume
-	if _, err := o.fcClient.ResumeVM(ctx, &proto.ResumeVMRequest{VMID: vmID}); err != nil {
-		log.Printf("failed to resume the VM")
-		return  err
-	}
-
 	return nil
 }
 

ctriface/image/manager_test.go

@@ -120,7 +120,7 @@ func TestMultipleConcurrent(t *testing.T) {
 			imgWg.Add(concurrentPulls)
 			for i := 0; i < concurrentPulls; i++ {
 				go func(i int) {
-					defer wg.Done()
+					defer imgWg.Done()
 					_, err := mgr.GetImage(ctx, imgName)
 					require.NoError(t, err, fmt.Sprintf("Failed to pull image %s", imgName))
 				}(i)

scripts/clean_fcctr.sh

@@ -71,7 +71,7 @@ echo Cleaning /run/firecracker-containerd/*
 sudo rm -rf /run/firecracker-containerd/containerd.sock.ttrpc \
     /run/firecracker-containerd/io.containerd.runtime.v1.linux \
     /run/firecracker-containerd/io.containerd.runtime.v2.task \
-    /run/containerd/s
+    /run/containerd/*
 
 echo Cleaning CNI state, e.g., allocated addresses
 sudo rm /var/lib/cni/networks/fcnet*/last_reserved_ip.0 || echo clean already