Fix snapshot commit

Signed-off-by: André Jesus <[email protected]>

Author: andre-j3sus

.github/workflows/cri_tests.yml

@@ -49,6 +49,10 @@ jobs:
       - name: Run vHive CRI tests
         run: source /etc/profile && go clean -testcache && go test ./cri -v -race -cover
 
+      - name: Run sandbox specific tests
+        if: ${{ inputs.sandbox == 'firecracker' }}
+        run: source /etc/profile && go clean -testcache && go test ./cri/${{ inputs.sandbox }} -v -race -cover
+
       - name: Archive log artifacts
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

cri/firecracker/coordinator.go

@@ -211,24 +211,26 @@ func (c *coordinator) orchCreateSnapshot(ctx context.Context, fi *funcInstance)
 
 	fi.Logger.Debug("creating instance snapshot before stopping")
 
-	err = c.orch.PauseVM(ctxTimeout, fi.VmID)
-	if err != nil {
-		fi.Logger.WithError(err).Error("failed to pause VM")
-		return err
-	}
+	if !c.withoutOrchestrator {
+		err = c.orch.PauseVM(ctxTimeout, fi.VmID)
+		if err != nil {
+			fi.Logger.WithError(err).Error("failed to pause VM")
+			return err
+		}
 
-	err = c.orch.CreateSnapshot(ctxTimeout, fi.VmID, snap)
-	if err != nil {
-		fi.Logger.WithError(err).Error("failed to create snapshot")
-		return err
-	}
+		err = c.orch.CreateSnapshot(ctxTimeout, fi.VmID, snap)
+		if err != nil {
+			fi.Logger.WithError(err).Error("failed to create snapshot")
+			return err
+		}
 
-	if _, err := c.orch.ResumeVM(ctx, fi.VmID); err != nil {
-		fi.Logger.WithError(err).Error("failed to resume VM")
-		return err
+		if _, err := c.orch.ResumeVM(ctx, fi.VmID); err != nil {
+			fi.Logger.WithError(err).Error("failed to resume VM")
+			return err
+		}
 	}
 
-	if err := c.snapshotManager.CommitSnapshot(fi.VmID); err != nil {
+	if err := c.snapshotManager.CommitSnapshot(fi.Revision); err != nil {
 		fi.Logger.WithError(err).Error("failed to commit snapshot")
 		return err
 	}

cri/firecracker/coordinator_test.go

@@ -98,3 +98,28 @@ func TestParallelStartStop(t *testing.T) {
 
 	wg.Wait()
 }
+
+func TestOrchCreateSnapshot(t *testing.T) {
+	containerID := "1"
+	revision := "myrev-1"
+
+	// Start VM
+	fi, err := coord.startVM(context.Background(), testImageName, revision)
+	require.NoError(t, err, "could not start VM")
+
+	err = coord.insertActive(containerID, fi)
+	require.NoError(t, err, "could not insert mapping")
+
+	// Trigger snapshot creation
+	err = coord.orchCreateSnapshot(context.Background(), fi)
+	require.NoError(t, err, "snapshot creation failed")
+
+	// Verify that the snapshot is available and ready
+	snap, err := coord.snapshotManager.AcquireSnapshot(revision)
+	require.NoError(t, err, "snapshot was not marked ready or does not exist")
+	require.NotNil(t, snap, "acquired snapshot is nil")
+
+	// Clean up
+	err = coord.stopVM(context.Background(), containerID)
+	require.NoError(t, err, "could not stop VM")
+}