P2-04.5: kill host.default_paths in favour of manual schedules
Two independent path lists for "what does this host back up?" was
a real divergence footgun — operator types one set at Add-host time
and a different set into a schedule, both end up in the same repo,
the snapshot history looks fine until restore. Resolution: drop
host.default_paths entirely; add a `manual` flag on schedules.
A manual schedule has paths/excludes/tags/retention like any other
but no cron — it fires only via per-schedule Run-now. Single source
of truth for what gets backed up.
Schema (migration 0007):
* schedules.manual INTEGER NOT NULL DEFAULT 0.
* For every host with non-empty default_paths, seed a manual
schedule with those paths and bump host_schedule_version.
* ALTER TABLE hosts DROP COLUMN default_paths.
* ALTER TABLE enrollment_tokens RENAME COLUMN default_paths
TO initial_paths.
Original draft of this migration rebuilt hosts via the
create-new + drop-old + rename-new pattern. With foreign_keys=ON
(set in the connection DSN), DROP TABLE on the parent fired
ON DELETE CASCADE on every child of hosts(id) — schedules /
jobs / snapshots / host_credentials all wiped on the smoke env
when I tried it. SQLite 3.35+ supports column-level ALTERs
directly, so we skip the rebuild dance and avoid the cascade
trap. Six lines of SQL instead of sixty, no FK risk.
Run-now rewiring:
* New `dispatchScheduleNow(hostID, scheduleID, conn?)` helper
unifies the agent-driven path (cron fire → schedule.fire →
OnScheduleFire callback) and the UI-driven path (operator
clicks Run-now on a schedule row). Conn arg is optional; nil
falls back to Hub.Send.
* New POST /hosts/{id}/schedules/{sid}/run endpoint — per-row
Run-now button on the schedules list.
* Dashboard's per-host Run-now (handleUIRunBackup) now picks the
host's only enabled manual schedule, falls back to the only
enabled schedule, else returns "pick one in Schedules tab".
Keeps one-click for the common case.
Agent:
* Scheduler skips manual schedules in cron build (silent — they're
a normal data shape, not an error).
* Wire Schedule struct gains Manual flag.
* Schedule.fire flow unchanged — the agent only ever fires
non-manual schedules anyway.
UI:
* Add-host form retitled "Initial schedule · manual" so the
operator knows the paths become an editable schedule under
the Schedules tab. Result page calls out the manual schedule
+ points at Host > Schedules.
* Schedule edit form: "Manual schedule" checkbox at the top of
the When section; toggling it hides/shows the cron field via
inline JS. Server-side validator skips the cron requirement
when manual=true.
* Schedule list shows a "manual" tag under the status pill and
renders the When column as "— run-now only —" for manual rows.
Each row gets a Run-now button when the schedule is enabled
and the host is online.
Tests + go test ./... green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -43,14 +43,14 @@
|
||||
<div class="field-help">Free-form. Used for filtering and grouping on the dashboard.</div>
|
||||
</div>
|
||||
|
||||
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4 pt-6 border-t border-line-soft">Default backup paths</h3>
|
||||
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4 pt-6 border-t border-line-soft">Initial schedule <span class="text-ink-fade font-normal">· manual</span></h3>
|
||||
<div class="mb-7">
|
||||
<label class="field-label" for="ah-paths">Paths <span class="text-ink-fade font-normal">· one per line</span></label>
|
||||
<textarea id="ah-paths" name="paths" rows="3" class="field mono"
|
||||
style="resize: vertical;"
|
||||
placeholder="/etc /home /var/lib/postgresql">{{$page.Paths}}</textarea>
|
||||
<div class="field-help">
|
||||
What <span class="mono text-ink-mid">restic backup</span> runs against when an operator hits “Run now”. Until schedules ship in Phase 2, this is the only source of paths for run-now jobs — leave it empty if you’ll dispatch via the JSON API instead.
|
||||
These paths become an <strong>initial manual schedule</strong> on the new host — manual = no cron, only fires when you click <span class="mono text-ink-mid">Run now</span>. You can edit this schedule (or add automated ones alongside it) from the host's <strong>Schedules</strong> tab. Leave blank to skip — the host will enrol but can't back up until you add a schedule.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -187,6 +187,10 @@
|
||||
<div>{{$page.ExpiresAt.Format "15:04:05.000"}} <span class="text-ink-mid">server</span> token minted · 1h ttl</div>
|
||||
<div class="text-ink-fade"> awaiting POST /api/agents/enroll …</div>
|
||||
</div>
|
||||
<p class="mt-4 text-[12.5px] text-ink-mid leading-[1.6]">
|
||||
Enrolment will create a <span class="mono text-ink">manual</span> schedule from the paths above. Find it (and add automated ones) under
|
||||
<span class="mono text-ink">Host > Schedules</span> once the agent connects.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<aside class="col-span-5">
|
||||
|
||||
@@ -38,9 +38,18 @@
|
||||
<div class="col-span-7 panel rounded-[7px] px-8 py-7">
|
||||
|
||||
<h3 class="text-[13px] font-semibold uppercase tracking-[0.08em] text-ink-mute mb-4">When</h3>
|
||||
|
||||
<div class="mb-5">
|
||||
<label class="flex items-center gap-2.5 cursor-pointer text-[13px]">
|
||||
<input id="se-manual" type="checkbox" name="manual" {{if $page.Manual}}checked{{end}}
|
||||
onchange="document.getElementById('se-cron-block').style.display=this.checked?'none':'';">
|
||||
<span>Manual schedule <span class="text-ink-fade font-normal">— no cron, only fires when you click Run-now</span></span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div id="se-cron-block" class="mb-5" {{if $page.Manual}}style="display: none;"{{end}}>
|
||||
<label class="field-label" for="se-cron">Cron expression</label>
|
||||
<input id="se-cron" name="cron_expr" type="text" class="field mono" required value="{{$page.CronExpr}}">
|
||||
<input id="se-cron" name="cron_expr" type="text" class="field mono" value="{{$page.CronExpr}}">
|
||||
<div class="field-help">
|
||||
Standard 5-field cron with descriptors. Examples:
|
||||
<span class="mono text-ink-mid">0 3 * * *</span> (daily 03:00),
|
||||
|
||||
@@ -56,9 +56,9 @@
|
||||
</div>
|
||||
{{else}}
|
||||
<div class="hairline grid items-baseline px-4 py-2.5 text-[11px] text-ink-fade uppercase tracking-[0.08em]"
|
||||
style="grid-template-columns: 0.5fr 1fr 2fr 1.5fr 0.5fr 0.7fr; column-gap: 18px;">
|
||||
style="grid-template-columns: 0.6fr 1.1fr 2fr 1.3fr 0.5fr 1fr; column-gap: 18px;">
|
||||
<div>Status</div>
|
||||
<div>Cron</div>
|
||||
<div>When</div>
|
||||
<div>Paths</div>
|
||||
<div>Retention</div>
|
||||
<div>Tags</div>
|
||||
@@ -66,24 +66,33 @@
|
||||
</div>
|
||||
{{range $page.Schedules}}
|
||||
<div class="grid items-center px-4 py-3 text-[13px] hairline"
|
||||
style="grid-template-columns: 0.5fr 1fr 2fr 1.5fr 0.5fr 0.7fr; column-gap: 18px;">
|
||||
<div>
|
||||
style="grid-template-columns: 0.6fr 1.1fr 2fr 1.3fr 0.5fr 1fr; column-gap: 18px;">
|
||||
<div class="flex flex-col gap-0.5">
|
||||
{{if .Enabled}}
|
||||
<span class="mono text-[11px] text-ok">enabled</span>
|
||||
{{else}}
|
||||
<span class="mono text-[11px] text-ink-fade">disabled</span>
|
||||
{{end}}
|
||||
{{if .Manual}}
|
||||
<span class="mono text-[10.5px] text-ink-mute">manual</span>
|
||||
{{end}}
|
||||
</div>
|
||||
<div class="mono text-ink">{{.CronExpr}}</div>
|
||||
<div class="mono text-ink">{{if .Manual}}<span class="text-ink-fade">— run-now only —</span>{{else}}{{.CronExpr}}{{end}}</div>
|
||||
<div class="mono text-ink-mid text-[12px] truncate" title="{{joinDot .Paths}}">{{joinDot .Paths}}</div>
|
||||
<div class="mono text-[12px] text-ink-mid">{{.RetentionPolicy.Summary}}</div>
|
||||
<div class="flex gap-1.5 flex-wrap">
|
||||
{{- range .Tags -}}<span class="tag">{{.}}</span>{{- end -}}
|
||||
</div>
|
||||
<div class="text-right flex gap-1.5 justify-end">
|
||||
{{if and .Enabled (eq $host.Status "online")}}
|
||||
<button class="btn btn-primary"
|
||||
hx-post="/hosts/{{$host.ID}}/schedules/{{.ID}}/run"
|
||||
hx-swap="none"
|
||||
hx-disabled-elt="this">Run now</button>
|
||||
{{end}}
|
||||
<a href="/hosts/{{$host.ID}}/schedules/{{.ID}}/edit" class="btn">Edit</a>
|
||||
<form method="post" action="/hosts/{{$host.ID}}/schedules/{{.ID}}/delete" style="display: inline;"
|
||||
onsubmit="return confirm('Delete schedule {{.CronExpr}}? Existing snapshots are not affected.');">
|
||||
onsubmit="return confirm('Delete this schedule? Existing snapshots are not affected.');">
|
||||
<button type="submit" class="btn btn-danger">Delete</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user