create unified for CH and FC

Author: CMGS

cmd/vm/debug.go

@@ -124,8 +124,8 @@ func printFCDebug(configs []*types.StorageConfig, boot *types.BootConfig, vmCfg
 		len(configs), cowPath)
 	fmt.Println()
 
-	balloonMiB := memMiB / 4     //nolint:mnd
-	if vmCfg.Memory >= 256<<20 { //nolint:mnd
+	balloonMiB := memMiB / hypervisor.DefaultBalloonDiv
+	if vmCfg.Memory >= hypervisor.MinBalloonMemory {
 		fmt.Printf("# 4. Balloon\n")
 		fmt.Printf("curl --unix-socket %s -X PUT http://localhost/balloon \\\n", sock)
 		fmt.Printf("  -d '{\"amount_mib\": %d, \"deflate_on_oom\": true, \"free_page_reporting\": true}'\n", balloonMiB)

hypervisor/backend.go

@@ -442,6 +442,26 @@ func (b *Backend) PrepareStart(ctx context.Context, id string, runtimeFiles []st
 	return &rec, nil
 }
 
+// FinalizeCreate writes the fully populated VM record to the DB after
+// disk preparation, replacing the placeholder written by ReserveVM.
+// RunDir and LogDir are carried over from the existing placeholder.
+func (b *Backend) FinalizeCreate(ctx context.Context, id string, info *types.VM, bootCfg *types.BootConfig, blobIDs map[string]struct{}) error {
+	return b.DB.Update(ctx, func(idx *VMIndex) error {
+		existing := idx.VMs[id]
+		if existing == nil {
+			return fmt.Errorf("vm %s disappeared from index", id)
+		}
+		idx.VMs[id] = &VMRecord{
+			VM:           *info,
+			BootConfig:   bootCfg,
+			ImageBlobIDs: blobIDs,
+			RunDir:       existing.RunDir,
+			LogDir:       existing.LogDir,
+		}
+		return nil
+	})
+}
+
 // FinalizeClone marks a just-cloned VM as running in the DB.
 // If blobIDs is non-nil, it overwrites the record's image blob pin set.
 func (b *Backend) FinalizeClone(ctx context.Context, vmID string, info *types.VM, bootCfg *types.BootConfig, blobIDs map[string]struct{}) error {

hypervisor/cloudhypervisor/create.go

@@ -66,25 +66,12 @@ func (ch *CloudHypervisor) Create(ctx context.Context, id string, vmCfg *types.V
 
 	info := &types.VM{
 		ID: id, Hypervisor: typ, State: types.VMStateCreated,
-		Config:         *vmCfg,
-		StorageConfigs: preparedStorage,
-		NetworkConfigs: networkConfigs,
-		CreatedAt:      now, UpdatedAt: now,
-	}
-	rec := hypervisor.VMRecord{
-		VM:           *info,
-		BootConfig:   bootCopy,
-		ImageBlobIDs: blobIDs,
-		RunDir:       runDir,
-		LogDir:       logDir,
-	}
-	if err := ch.DB.Update(ctx, func(idx *hypervisor.VMIndex) error {
-		idx.VMs[id] = &rec
-		return nil
-	}); err != nil {
+		Config: *vmCfg, StorageConfigs: preparedStorage, NetworkConfigs: networkConfigs,
+		CreatedAt: now, UpdatedAt: now,
+	}
+	if err := ch.FinalizeCreate(ctx, id, info, bootCopy, blobIDs); err != nil {
 		return nil, fmt.Errorf("finalize VM record: %w", err)
 	}
-
 	return info, nil
 }
 

hypervisor/firecracker/create.go

@@ -56,22 +56,10 @@ func (fc *Firecracker) Create(ctx context.Context, id string, vmCfg *types.VMCon
 
 	info := &types.VM{
 		ID: id, Hypervisor: typ, State: types.VMStateCreated,
-		Config:         *vmCfg,
-		StorageConfigs: preparedStorage,
-		NetworkConfigs: networkConfigs,
-		CreatedAt:      now, UpdatedAt: now,
-	}
-	rec := hypervisor.VMRecord{
-		VM:           *info,
-		BootConfig:   bootCopy,
-		ImageBlobIDs: blobIDs,
-		RunDir:       runDir,
-		LogDir:       logDir,
-	}
-	if err := fc.DB.Update(ctx, func(idx *hypervisor.VMIndex) error {
-		idx.VMs[id] = &rec
-		return nil
-	}); err != nil {
+		Config: *vmCfg, StorageConfigs: preparedStorage, NetworkConfigs: networkConfigs,
+		CreatedAt: now, UpdatedAt: now,
+	}
+	if err := fc.FinalizeCreate(ctx, id, info, bootCopy, blobIDs); err != nil {
 		return nil, fmt.Errorf("finalize VM record: %w", err)
 	}
 	return info, nil

images/index.go

@@ -167,7 +167,7 @@ func GCStaleTemp(ctx context.Context, dir string, dirOnly bool) []error {
 }
 
 // GCCollectBlobs removes temp files and blob artifacts by hex ID.
-// removers are called for each hex; os.IsNotExist errors are ignored.
+// removers are called for each hex; fs.ErrNotExist errors are ignored.
 func GCCollectBlobs(ctx context.Context, tempDir string, dirOnly bool, ids []string, removers ...func(string) error) error {
 	var errs []error
 	errs = append(errs, GCStaleTemp(ctx, tempDir, dirOnly)...)

snapshot/localfile/localfile_test.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -312,7 +313,7 @@ func TestDelete(t *testing.T) {
 	}
 
 	// Data dir should be gone.
-	if _, err := os.Stat(lf.conf.SnapshotDataDir(id)); !os.IsNotExist(err) {
+	if _, err := os.Stat(lf.conf.SnapshotDataDir(id)); !errors.Is(err, fs.ErrNotExist) {
 		t.Error("expected data dir to be removed")
 	}