steve
8fb1c100fd
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>
54 lines
2.0 KiB
SQL
54 lines
2.0 KiB
SQL
-- 0007_manual_schedules.sql
|
|
--
|
|
-- Unify "what does this host back up?" under schedules. Drop the
|
|
-- legacy host.default_paths column in favour of a `manual` flag on
|
|
-- schedules: a manual schedule carries paths/excludes/tags/retention
|
|
-- like any other but has no cron expression — it only fires when
|
|
-- the operator clicks Run-now.
|
|
--
|
|
-- Steps (each is a single ALTER, no table rebuilds):
|
|
-- 1. Add schedules.manual.
|
|
-- 2. For every host with non-empty default_paths, create a manual
|
|
-- schedule seeded with those paths and bump host_schedule_version
|
|
-- so the next push reaches the agent.
|
|
-- 3. ALTER TABLE hosts DROP COLUMN default_paths.
|
|
-- 4. ALTER TABLE enrollment_tokens RENAME COLUMN default_paths
|
|
-- TO initial_paths.
|
|
--
|
|
-- The earlier draft of this migration rebuilt hosts via the
|
|
-- create-new + drop-old + rename pattern. With foreign_keys=ON
|
|
-- (which the connection DSN sets), DROP TABLE on the parent
|
|
-- triggered ON DELETE CASCADE on every child of hosts(id) — the
|
|
-- smoke env lost schedules / jobs / snapshots / host_credentials
|
|
-- as a result. SQLite 3.35+ supports column-level ALTERs, so we
|
|
-- skip the rebuild entirely and avoid the cascade trap.
|
|
|
|
ALTER TABLE schedules ADD COLUMN manual INTEGER NOT NULL DEFAULT 0;
|
|
|
|
INSERT INTO schedules (
|
|
id, host_id, kind, cron_expr,
|
|
paths, excludes, tags, retention_policy, options,
|
|
pre_hook, post_hook, enabled, manual, created_at, updated_at
|
|
)
|
|
SELECT
|
|
lower(hex(randomblob(13))),
|
|
id, 'backup', '',
|
|
default_paths, '[]', '[]', '{}', '{}',
|
|
'', '', 1, 1,
|
|
strftime('%Y-%m-%dT%H:%M:%fZ', 'now'),
|
|
strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
|
|
FROM hosts
|
|
WHERE default_paths IS NOT NULL
|
|
AND default_paths != ''
|
|
AND default_paths != '[]';
|
|
|
|
INSERT INTO host_schedule_version (host_id, version)
|
|
SELECT id, 1 FROM hosts
|
|
WHERE default_paths IS NOT NULL
|
|
AND default_paths != ''
|
|
AND default_paths != '[]'
|
|
ON CONFLICT(host_id) DO UPDATE SET version = version + 1;
|
|
|
|
ALTER TABLE hosts DROP COLUMN default_paths;
|
|
ALTER TABLE enrollment_tokens RENAME COLUMN default_paths TO initial_paths;
|