reconcile: tier-aware restore-task deadline (S4.1 unattended offsite restore-test)
A WAN (pbs-tier) restore of a large guest exceeds the restore-task wait's 10m default → the wait expired mid-restore, teardown fired against a still-restoring (not-yet-pool-associated) scratch guest → leak + a phantom VM.Allocate 403. - RestoreTestSpec.RestoreTaskTimeout (0→10m default); the restore WaitTask passes it. Local tier unchanged (10m). - config RestoreTestPBSRestoreTimeoutSeconds + accessor (default 120m). - main restoreTaskTimeout(cfg,tier): configured PBS timeout only when tier==pbs, else 0. Both scheduler + selftest spec builds. - Tests + WaitOptions red-proof + accessor contract. The "grant scratch-band VM.Allocate" follow-up is diagnosed not blind-applied: the scratch is restored INTO /pool/felhom (ACL already grants VM.Allocate), so the earlier 403 was a consequence of the timeout. No ACL/host-install change. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PSK5g6qYLknKj8u3QAFEr6
This commit is contained in:
@@ -47,6 +47,7 @@ type fakeAPI struct {
|
||||
restores []proxmox.RestoreLXCOptions
|
||||
destroys []int
|
||||
waits []string
|
||||
waitOpts []proxmox.WaitOptions // parallel to waits: the options each WaitTask was called with
|
||||
listErr error
|
||||
}
|
||||
|
||||
@@ -151,9 +152,10 @@ func (f *fakeAPI) ResizeLXC(_ context.Context, vmid int, disk, size string) (str
|
||||
return f.resizeUPID, f.resizeErr
|
||||
}
|
||||
|
||||
func (f *fakeAPI) WaitTask(_ context.Context, upid string, _ proxmox.WaitOptions) (proxmox.TaskStatus, error) {
|
||||
func (f *fakeAPI) WaitTask(_ context.Context, upid string, opts proxmox.WaitOptions) (proxmox.TaskStatus, error) {
|
||||
f.mu.Lock()
|
||||
f.waits = append(f.waits, upid)
|
||||
f.waitOpts = append(f.waitOpts, opts)
|
||||
f.mu.Unlock()
|
||||
if f.waitFunc != nil {
|
||||
return f.waitFunc(upid)
|
||||
|
||||
@@ -35,6 +35,11 @@ type RestoreTestSpec struct {
|
||||
ScratchMin int // inclusive scratch VMID band (must be > 0)
|
||||
ScratchMax int // inclusive
|
||||
BootTimeout time.Duration // 0 → DefaultBootTimeout
|
||||
// RestoreTaskTimeout bounds the wait on the restore (vzrestore) task. 0 → WaitOptions' 10m
|
||||
// default (fine for a LOCAL restore). A WAN/pbs restore of a large guest runs long, so the
|
||||
// caller sets this generously for the pbs tier — else the wait expires mid-restore, teardown
|
||||
// fires against a still-restoring (not-yet-pool-associated) guest, and the scratch leaks.
|
||||
RestoreTaskTimeout time.Duration
|
||||
}
|
||||
|
||||
// RestoreTestResult is the reconcile-local outcome (the backup package maps it to the
|
||||
@@ -243,7 +248,7 @@ func (e *Engine) runScratchTest(ctx context.Context, vmid int, spec RestoreTestS
|
||||
launched = true
|
||||
e.append(withUPID(base, upid, OpTaskRunning))
|
||||
if upid != "" {
|
||||
if _, err := e.api.WaitTask(ctx, upid, proxmox.WaitOptions{}); err != nil {
|
||||
if _, err := e.api.WaitTask(ctx, upid, proxmox.WaitOptions{Timeout: spec.RestoreTaskTimeout}); err != nil {
|
||||
res.Err = fmt.Errorf("reconcile: restore-test restore task: %w", err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -56,6 +56,49 @@ func TestRunRestoreTest_PassAndTeardown(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestRunRestoreTest_TierAwareRestoreTimeout (S4.1) pins that the restore-task wait carries the
|
||||
// tier-derived timeout: the configured (generous) value for a pbs/WAN restore, and 0 (→ the 10m
|
||||
// WaitOptions default, UNCHANGED) for a local restore. Red-proof: revert the L246 wait to
|
||||
// WaitOptions{} → the pbs assertion (120m) fails.
|
||||
func TestRunRestoreTest_TierAwareRestoreTimeout(t *testing.T) {
|
||||
const restoreUPID = "UPID:node:1:2:3:4:vzrestore:990000:tok:" // async restore → the wait fires
|
||||
|
||||
restoreWaitTimeout := func(api *fakeAPI) (time.Duration, bool) {
|
||||
for i, u := range api.waits {
|
||||
if u == restoreUPID {
|
||||
return api.waitOpts[i].Timeout, true
|
||||
}
|
||||
}
|
||||
return 0, false
|
||||
}
|
||||
|
||||
// pbs tier → the configured generous timeout is passed to WaitTask.
|
||||
pbsAPI := &fakeAPI{cfg: map[int]proxmox.GuestConfig{990000: scratchCfg()}, restoreUPID: restoreUPID}
|
||||
e, _, q := newEngine(t, pbsAPI, EmptyProvider{})
|
||||
defer q.Close()
|
||||
e.RunRestoreTest(context.Background(), RestoreTestSpec{
|
||||
Archive: "felhom-offsite:backup/ct/9201/x", RestoreStorage: "local-lvm",
|
||||
ScratchMin: 990000, ScratchMax: 990009, SourceTier: "pbs",
|
||||
RestoreTaskTimeout: 120 * time.Minute,
|
||||
})
|
||||
if to, ok := restoreWaitTimeout(pbsAPI); !ok || to != 120*time.Minute {
|
||||
t.Errorf("pbs restore wait Timeout = %v (found=%v), want 120m", to, ok)
|
||||
}
|
||||
|
||||
// local tier → 0 (→ WaitOptions' 10m default preserved, UNCHANGED).
|
||||
localAPI := &fakeAPI{cfg: map[int]proxmox.GuestConfig{990000: scratchCfg()}, restoreUPID: restoreUPID}
|
||||
e2, _, q2 := newEngine(t, localAPI, EmptyProvider{})
|
||||
defer q2.Close()
|
||||
e2.RunRestoreTest(context.Background(), RestoreTestSpec{
|
||||
Archive: "local:backup/x.tar.zst", RestoreStorage: "local-lvm",
|
||||
ScratchMin: 990000, ScratchMax: 990009, SourceTier: "local",
|
||||
RestoreTaskTimeout: 0,
|
||||
})
|
||||
if to, ok := restoreWaitTimeout(localAPI); !ok || to != 0 {
|
||||
t.Errorf("local restore wait Timeout = %v (found=%v), want 0 (→10m default)", to, ok)
|
||||
}
|
||||
}
|
||||
|
||||
// startWarnAPI builds a fakeAPI whose guest-start task exits "WARNINGS: 1" and whose start
|
||||
// task log contains the given warning lines. The guest reaches running (status default).
|
||||
func startWarnAPI(startUPID string, logLines []string) *fakeAPI {
|
||||
|
||||
Reference in New Issue
Block a user