Claude Code
a7421b09c7
Found by the first real PBS restore round-trip, not by review. Restoring a felhom-pbs: archive on a box whose primary target is 'local' failed after exactly 600.76s — the 10-minute LOCAL wait — against a 14.46 GB WAN restore needing ~2 hours. The selftest derived its tier from cfg.Backup.BackupTarget() (the configured default), so restoreTaskTimeout correctly returned the local bound for a PBS archive. The recorded result even said source_tier=local for a PBS archive. The tier-aware machinery was already right; it was fed the wrong input. What broke is an assumption that stopped being true the moment a second tier existed: 'the configured target' is no longer a proxy for 'the tier this archive belongs to'. RestoreTestSpec.RestoreTaskTimeout's doc comment predicts the consequence exactly, and it happened: teardown fired at a still-restoring guest and was refused with HTTP 403 missing privilege VM.Allocate (PVE associates the pool only at restore COMPLETION, and the grant is on /pool/felhom not /vms). That 403 was load-bearing luck — the only reason a destructive teardown did not run against a half-restored guest. The restore completed unharmed. - restoreTierForArchive() derives the tier from the archive's own storage (archiveStorageID parses the volid prefix), falling back to the configured target only when there is no prefix. Recorded, NOT fixed here: the daemon's scheduled restore-test still only covers the PRIMARY tier (Pick uses a runner built on BackupTarget(); Spec is built once at construction, not per tick) — so the offsite tier is never automatically restore-tested. And the agent still cannot tear down a scratch guest until its restore completes; widening the token's privileges is deliberately not the fix. Full suite green (29 packages).
24 lines
979 B
Go
24 lines
979 B
Go
package main
|
|
|
|
import "testing"
|
|
|
|
// R-82 live regression (2026-07-26): the restore-test derived its tier from the CONFIGURED default
|
|
// target instead of the archive's own storage. Restoring a `felhom-pbs:` archive on a box whose
|
|
// primary target is "local" was classified "local" → the 10-minute local wait instead of the
|
|
// generous PBS one → the wait expired mid-restore at 600s against a 14.46 GB WAN restore, teardown
|
|
// fired at a still-restoring guest, and the scratch leaked.
|
|
func TestArchiveStorageID(t *testing.T) {
|
|
cases := []struct{ in, want string }{
|
|
{"felhom-pbs:backup/ct/9201/2026-07-26T12:21:48Z", "felhom-pbs"},
|
|
{"local:backup/vzdump-lxc-9201-2026_07_26-09_03_19.tar.zst", "local"},
|
|
{"", ""},
|
|
{"no-prefix", ""},
|
|
{":leading-colon", ""}, // i>0 guard: a leading colon is not a storage id
|
|
}
|
|
for _, c := range cases {
|
|
if got := archiveStorageID(c.in); got != c.want {
|
|
t.Fatalf("archiveStorageID(%q) = %q, want %q", c.in, got, c.want)
|
|
}
|
|
}
|
|
}
|