Thales Maciel
466a7c30c4
Phase 4 of the daemon god-struct refactor. VM lifecycle, create-op
registry, handle cache, disk provisioning, stats polling, ports
query, and the per-VM lock set all move off *Daemon onto *VMService.
Daemon keeps thin forwarders only for FindVM / TouchVM (dispatch
surface) and is otherwise out of VM lifecycle. Lazy-init via
d.vmSvc() mirrors the earlier services so test literals like
\`&Daemon{store: db, runner: r}\` still get a functional service
without spelling one out.
Three small cleanups along the way:
* preflight helpers (validateStartPrereqs / addBaseStartPrereqs
/ addBaseStartCommandPrereqs / validateWorkDiskResizePrereqs)
move with the VM methods that call them.
* cleanupRuntime / rebuildDNS move to *VMService, with
HostNetwork primitives (findFirecrackerPID, cleanupDMSnapshot,
killVMProcess, releaseTap, waitForExit, sendCtrlAltDel)
reached through s.net instead of the hostNet() facade.
* vsockAgentBinary becomes a package-level function so both
*Daemon (doctor) and *VMService (preflight) call one entry
point instead of each owning a forwarder method.
WorkspaceService's peer deps switch from eager method values to
closures — vmSvc() constructs VMService with WorkspaceService as a
peer, so resolving d.vmSvc().FindVM at construction time recursed
through workspaceSvc() → vmSvc(). Closures defer the lookup to call
time.
Pure code motion: build + unit tests green, lint clean. No RPC
surface or lock-ordering changes.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
86 lines
3.1 KiB
Go
86 lines
3.1 KiB
Go
package daemon
|
|
|
|
import (
|
|
"context"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
|
|
"banger/internal/model"
|
|
"banger/internal/paths"
|
|
)
|
|
|
|
// TestReserveVMAllowsNameThatPrefixesExistingVM is a regression for a
|
|
// correctness bug in the name-uniqueness check: reserveVM used to
|
|
// route through FindVM, which falls back to prefix-matching on both
|
|
// ids and names. That meant a perfectly valid new name like "beta"
|
|
// could be rejected simply because an existing VM's id or name
|
|
// started with "beta". Exact-name lookup via store.GetVMByName fixes
|
|
// it. The test seeds a VM whose id and name are long strings, then
|
|
// tries to reserve a new VM with a name that's a prefix of each —
|
|
// both must succeed.
|
|
func TestReserveVMAllowsNameThatPrefixesExistingVM(t *testing.T) {
|
|
ctx := context.Background()
|
|
tmp := t.TempDir()
|
|
d := &Daemon{
|
|
store: openDaemonStore(t),
|
|
layout: paths.Layout{VMsDir: filepath.Join(tmp, "vms"), RuntimeDir: filepath.Join(tmp, "runtime")},
|
|
config: model.DaemonConfig{BridgeIP: model.DefaultBridgeIP},
|
|
}
|
|
|
|
existing := testVM("longname-sandbox-foobar", "image-x", "172.16.0.50")
|
|
upsertDaemonVM(t, ctx, d.store, existing)
|
|
|
|
image := testImage("image-x")
|
|
image.ID = "image-x"
|
|
image.Name = "image-x"
|
|
if err := d.store.UpsertImage(ctx, image); err != nil {
|
|
t.Fatalf("UpsertImage: %v", err)
|
|
}
|
|
|
|
// New VM name is a prefix of the existing id (which is
|
|
// "longname-sandbox-foobar-id" per testVM). Old FindVM-based check
|
|
// would reject this.
|
|
if vm, err := d.vmSvc().reserveVM(ctx, "longname", image, model.VMSpec{VCPUCount: 1, MemoryMiB: 128}); err != nil {
|
|
t.Fatalf("reserveVM(prefix of id): %v", err)
|
|
} else if vm.Name != "longname" {
|
|
t.Fatalf("reserveVM returned name=%q, want longname", vm.Name)
|
|
}
|
|
|
|
// Prefix of the existing name ("longname-sandbox") must also work.
|
|
if vm, err := d.vmSvc().reserveVM(ctx, "longname-sandbox", image, model.VMSpec{VCPUCount: 1, MemoryMiB: 128}); err != nil {
|
|
t.Fatalf("reserveVM(prefix of name): %v", err)
|
|
} else if vm.Name != "longname-sandbox" {
|
|
t.Fatalf("reserveVM returned name=%q, want longname-sandbox", vm.Name)
|
|
}
|
|
}
|
|
|
|
// TestReserveVMRejectsExactDuplicateName confirms the uniqueness
|
|
// check still catches actual collisions after the FindVM → GetVMByName
|
|
// switch.
|
|
func TestReserveVMRejectsExactDuplicateName(t *testing.T) {
|
|
ctx := context.Background()
|
|
tmp := t.TempDir()
|
|
d := &Daemon{
|
|
store: openDaemonStore(t),
|
|
layout: paths.Layout{VMsDir: filepath.Join(tmp, "vms"), RuntimeDir: filepath.Join(tmp, "runtime")},
|
|
config: model.DaemonConfig{BridgeIP: model.DefaultBridgeIP},
|
|
}
|
|
existing := testVM("sandbox", "image-x", "172.16.0.51")
|
|
upsertDaemonVM(t, ctx, d.store, existing)
|
|
|
|
image := testImage("image-x")
|
|
image.ID = "image-x"
|
|
image.Name = "image-x"
|
|
if err := d.store.UpsertImage(ctx, image); err != nil {
|
|
t.Fatalf("UpsertImage: %v", err)
|
|
}
|
|
|
|
_, err := d.vmSvc().reserveVM(ctx, "sandbox", image, model.VMSpec{VCPUCount: 1, MemoryMiB: 128})
|
|
if err == nil {
|
|
t.Fatal("reserveVM with duplicate name should have failed")
|
|
}
|
|
if !strings.Contains(err.Error(), "already exists") {
|
|
t.Fatalf("err = %v, want 'already exists'", err)
|
|
}
|
|
}
|