Separates what a VM IS (durable intent + identity + deterministic
derived paths — `VMRuntime`) from what is CURRENTLY TRUE about it
(firecracker PID, tap device, loop devices, dm-snapshot target — new
`VMHandles`). The durable state lives in the SQLite `vms` row; the
transient state lives in an in-memory cache on the daemon plus a
per-VM `handles.json` scratch file inside VMDir, rebuilt at startup
from OS inspection. Nothing kernel-level rides the SQLite schema
anymore.
Why:
Persisting ephemeral process handles to SQLite forced reconcile to
treat "running with a stale PID" as a first-class case and mix it
with real state transitions. The schema described what we last
observed, not what the VM is. Every time the observation model
shifted (tap pool, DM naming, pgrep fallback) the reconcile logic
grew a new branch. Splitting lets each layer own what it's good at:
durable records describe intent, in-memory cache + scratch file
describe momentary reality.
Shape:
- `model.VMHandles` = PID, TapDevice, BaseLoop, COWLoop, DMName,
DMDev. Never in SQLite.
- `VMRuntime` keeps: State, GuestIP, APISockPath, VSockPath,
VSockCID, LogPath, MetricsPath, DNSName, VMDir, SystemOverlay,
WorkDiskPath, LastError. All durable or deterministic.
- `handleCache` on `*Daemon` — mutex-guarded map + scratch-file
plumbing (`writeHandlesFile` / `readHandlesFile` /
`rediscoverHandles`). See `internal/daemon/vm_handles.go`.
- `d.vmAlive(vm)` replaces the 20+ inline
`vm.State==Running && ProcessRunning(vm.Runtime.PID, apiSock)`
spreads. Single source of truth for liveness.
- Startup reconcile: per running VM, load the scratch file, pgrep
the api sock, either keep (cache seeded from scratch) or demote
to stopped (scratch handles passed to cleanupRuntime first so DM
/ loops / tap actually get torn down).
Verification:
- `go test ./...` green.
- Live: `banger vm run --name handles-test -- cat /etc/hostname`
starts; `handles.json` appears in VMDir with the expected PID,
tap, loops, DM.
- `kill -9 $(pgrep bangerd)` while the VM is running, re-invoke the
CLI, daemon auto-starts, reconcile recognises the VM as alive,
`banger vm ssh` still connects, `banger vm delete` cleans up.
Tests added:
- vm_handles_test.go: scratch-file roundtrip, missing/corrupt file
behaviour, cache concurrency, rediscoverHandles prefers pgrep
over scratch, returns scratch contents even when process is
dead (so cleanup can tear down kernel state).
- vm_test.go: reconcile test rewritten to exercise the new flow
(write scratch → reconcile reads it → verifies process is gone →
issues dmsetup/losetup teardown).
ARCHITECTURE.md updated; `handles` added to Daemon field docs.
130 lines
2.8 KiB
Go
130 lines
2.8 KiB
Go
package daemon
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
"sync"
|
|
)
|
|
|
|
const tapPoolPrefix = "tap-pool-"
|
|
|
|
// tapPool owns the idle TAP interface cache plus the monotonic index used to
|
|
// name new pool entries. All access goes through mu.
|
|
type tapPool struct {
|
|
mu sync.Mutex
|
|
entries []string
|
|
next int
|
|
}
|
|
|
|
func (d *Daemon) initializeTapPool(ctx context.Context) error {
|
|
if d.config.TapPoolSize <= 0 || d.store == nil {
|
|
return nil
|
|
}
|
|
vms, err := d.store.ListVMs(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
next := 0
|
|
for _, vm := range vms {
|
|
if index, ok := parseTapPoolIndex(d.vmHandles(vm.ID).TapDevice); ok && index >= next {
|
|
next = index + 1
|
|
}
|
|
}
|
|
d.tapPool.mu.Lock()
|
|
d.tapPool.next = next
|
|
d.tapPool.mu.Unlock()
|
|
return nil
|
|
}
|
|
|
|
func (d *Daemon) ensureTapPool(ctx context.Context) {
|
|
if d.config.TapPoolSize <= 0 {
|
|
return
|
|
}
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
return
|
|
case <-d.closing:
|
|
return
|
|
default:
|
|
}
|
|
|
|
d.tapPool.mu.Lock()
|
|
if len(d.tapPool.entries) >= d.config.TapPoolSize {
|
|
d.tapPool.mu.Unlock()
|
|
return
|
|
}
|
|
tapName := fmt.Sprintf("%s%d", tapPoolPrefix, d.tapPool.next)
|
|
d.tapPool.next++
|
|
d.tapPool.mu.Unlock()
|
|
|
|
if err := d.createTap(ctx, tapName); err != nil {
|
|
if d.logger != nil {
|
|
d.logger.Warn("tap pool warmup failed", "tap_device", tapName, "error", err.Error())
|
|
}
|
|
return
|
|
}
|
|
|
|
d.tapPool.mu.Lock()
|
|
d.tapPool.entries = append(d.tapPool.entries, tapName)
|
|
d.tapPool.mu.Unlock()
|
|
|
|
if d.logger != nil {
|
|
d.logger.Debug("tap added to idle pool", "tap_device", tapName)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (d *Daemon) acquireTap(ctx context.Context, fallbackName string) (string, error) {
|
|
d.tapPool.mu.Lock()
|
|
if n := len(d.tapPool.entries); n > 0 {
|
|
tapName := d.tapPool.entries[n-1]
|
|
d.tapPool.entries = d.tapPool.entries[:n-1]
|
|
d.tapPool.mu.Unlock()
|
|
return tapName, nil
|
|
}
|
|
d.tapPool.mu.Unlock()
|
|
|
|
if err := d.createTap(ctx, fallbackName); err != nil {
|
|
return "", err
|
|
}
|
|
return fallbackName, nil
|
|
}
|
|
|
|
func (d *Daemon) releaseTap(ctx context.Context, tapName string) error {
|
|
tapName = strings.TrimSpace(tapName)
|
|
if tapName == "" {
|
|
return nil
|
|
}
|
|
if isTapPoolName(tapName) {
|
|
d.tapPool.mu.Lock()
|
|
if len(d.tapPool.entries) < d.config.TapPoolSize {
|
|
d.tapPool.entries = append(d.tapPool.entries, tapName)
|
|
d.tapPool.mu.Unlock()
|
|
return nil
|
|
}
|
|
d.tapPool.mu.Unlock()
|
|
}
|
|
_, err := d.runner.RunSudo(ctx, "ip", "link", "del", tapName)
|
|
if err == nil {
|
|
go d.ensureTapPool(context.Background())
|
|
}
|
|
return err
|
|
}
|
|
|
|
func isTapPoolName(tapName string) bool {
|
|
return strings.HasPrefix(strings.TrimSpace(tapName), tapPoolPrefix)
|
|
}
|
|
|
|
func parseTapPoolIndex(tapName string) (int, bool) {
|
|
if !isTapPoolName(tapName) {
|
|
return 0, false
|
|
}
|
|
value, err := strconv.Atoi(strings.TrimPrefix(strings.TrimSpace(tapName), tapPoolPrefix))
|
|
if err != nil {
|
|
return 0, false
|
|
}
|
|
return value, true
|
|
}
|