148e61b33b
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>
282 lines
8.1 KiB
Go
282 lines
8.1 KiB
Go
package store
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
)
|
|
|
|
// CreateSchedule inserts a new schedule and bumps the host's
|
|
// schedule_version atomically. Returns the inserted row's
|
|
// CreatedAt / UpdatedAt timestamps written into s.
|
|
func (st *Store) CreateSchedule(ctx context.Context, s *Schedule) error {
|
|
if s.ID == "" || s.HostID == "" {
|
|
return errors.New("store: schedule id and host_id required")
|
|
}
|
|
now := time.Now().UTC()
|
|
s.CreatedAt = now
|
|
s.UpdatedAt = now
|
|
if s.Paths == nil {
|
|
s.Paths = []string{}
|
|
}
|
|
if s.Excludes == nil {
|
|
s.Excludes = []string{}
|
|
}
|
|
if s.Tags == nil {
|
|
s.Tags = []string{}
|
|
}
|
|
pathsJSON, _ := json.Marshal(s.Paths)
|
|
excludesJSON, _ := json.Marshal(s.Excludes)
|
|
tagsJSON, _ := json.Marshal(s.Tags)
|
|
retentionJSON, _ := json.Marshal(s.RetentionPolicy)
|
|
optionsJSON, _ := json.Marshal(s.Options)
|
|
|
|
tx, err := st.db.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
return fmt.Errorf("store: begin tx: %w", err)
|
|
}
|
|
defer func() { _ = tx.Rollback() }()
|
|
|
|
if _, err := tx.ExecContext(ctx,
|
|
`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
|
|
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
|
s.ID, s.HostID, s.Kind, s.CronExpr,
|
|
string(pathsJSON), string(excludesJSON), string(tagsJSON),
|
|
string(retentionJSON), string(optionsJSON),
|
|
s.PreHook, s.PostHook, boolToInt(s.Enabled), boolToInt(s.Manual),
|
|
now.Format(time.RFC3339Nano), now.Format(time.RFC3339Nano),
|
|
); err != nil {
|
|
return fmt.Errorf("store: create schedule: %w", err)
|
|
}
|
|
if err := bumpHostScheduleVersionTx(ctx, tx, s.HostID); err != nil {
|
|
return err
|
|
}
|
|
return tx.Commit()
|
|
}
|
|
|
|
// UpdateSchedule replaces every editable field on an existing row
|
|
// and bumps host_schedule_version. ID and HostID must match an
|
|
// existing row; kind is immutable (creating a new schedule is
|
|
// cheaper than re-keying retention/hooks).
|
|
func (st *Store) UpdateSchedule(ctx context.Context, s *Schedule) error {
|
|
if s.ID == "" || s.HostID == "" {
|
|
return errors.New("store: schedule id and host_id required")
|
|
}
|
|
if s.Paths == nil {
|
|
s.Paths = []string{}
|
|
}
|
|
if s.Excludes == nil {
|
|
s.Excludes = []string{}
|
|
}
|
|
if s.Tags == nil {
|
|
s.Tags = []string{}
|
|
}
|
|
pathsJSON, _ := json.Marshal(s.Paths)
|
|
excludesJSON, _ := json.Marshal(s.Excludes)
|
|
tagsJSON, _ := json.Marshal(s.Tags)
|
|
retentionJSON, _ := json.Marshal(s.RetentionPolicy)
|
|
optionsJSON, _ := json.Marshal(s.Options)
|
|
now := time.Now().UTC()
|
|
|
|
tx, err := st.db.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
return fmt.Errorf("store: begin tx: %w", err)
|
|
}
|
|
defer func() { _ = tx.Rollback() }()
|
|
|
|
res, err := tx.ExecContext(ctx,
|
|
`UPDATE schedules SET
|
|
cron_expr = ?, paths = ?, excludes = ?, tags = ?,
|
|
retention_policy = ?, options = ?,
|
|
pre_hook = ?, post_hook = ?, enabled = ?, manual = ?,
|
|
updated_at = ?
|
|
WHERE id = ? AND host_id = ?`,
|
|
s.CronExpr,
|
|
string(pathsJSON), string(excludesJSON), string(tagsJSON),
|
|
string(retentionJSON), string(optionsJSON),
|
|
s.PreHook, s.PostHook, boolToInt(s.Enabled), boolToInt(s.Manual),
|
|
now.Format(time.RFC3339Nano),
|
|
s.ID, s.HostID,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("store: update schedule: %w", err)
|
|
}
|
|
n, _ := res.RowsAffected()
|
|
if n == 0 {
|
|
return ErrNotFound
|
|
}
|
|
s.UpdatedAt = now
|
|
if err := bumpHostScheduleVersionTx(ctx, tx, s.HostID); err != nil {
|
|
return err
|
|
}
|
|
return tx.Commit()
|
|
}
|
|
|
|
// DeleteSchedule removes a schedule and bumps host_schedule_version.
|
|
// Returns ErrNotFound if no row matched.
|
|
func (st *Store) DeleteSchedule(ctx context.Context, hostID, scheduleID string) error {
|
|
tx, err := st.db.BeginTx(ctx, nil)
|
|
if err != nil {
|
|
return fmt.Errorf("store: begin tx: %w", err)
|
|
}
|
|
defer func() { _ = tx.Rollback() }()
|
|
|
|
res, err := tx.ExecContext(ctx,
|
|
`DELETE FROM schedules WHERE id = ? AND host_id = ?`,
|
|
scheduleID, hostID)
|
|
if err != nil {
|
|
return fmt.Errorf("store: delete schedule: %w", err)
|
|
}
|
|
n, _ := res.RowsAffected()
|
|
if n == 0 {
|
|
return ErrNotFound
|
|
}
|
|
if err := bumpHostScheduleVersionTx(ctx, tx, hostID); err != nil {
|
|
return err
|
|
}
|
|
return tx.Commit()
|
|
}
|
|
|
|
// GetSchedule returns one schedule by (host_id, id). Returns
|
|
// ErrNotFound on miss.
|
|
func (st *Store) GetSchedule(ctx context.Context, hostID, scheduleID string) (*Schedule, error) {
|
|
row := st.db.QueryRowContext(ctx,
|
|
`SELECT id, host_id, kind, cron_expr, paths, excludes, tags,
|
|
retention_policy, options, pre_hook, post_hook, enabled, manual,
|
|
created_at, updated_at
|
|
FROM schedules WHERE id = ? AND host_id = ?`,
|
|
scheduleID, hostID)
|
|
s, err := scanSchedule(row)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, ErrNotFound
|
|
}
|
|
return s, err
|
|
}
|
|
|
|
// ListSchedulesByHost returns every schedule for a host, ordered
|
|
// by created_at. Empty slice on miss (not an error).
|
|
func (st *Store) ListSchedulesByHost(ctx context.Context, hostID string) ([]Schedule, error) {
|
|
rows, err := st.db.QueryContext(ctx,
|
|
`SELECT id, host_id, kind, cron_expr, paths, excludes, tags,
|
|
retention_policy, options, pre_hook, post_hook, enabled, manual,
|
|
created_at, updated_at
|
|
FROM schedules WHERE host_id = ? ORDER BY created_at`,
|
|
hostID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("store: list schedules: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
out := []Schedule{}
|
|
for rows.Next() {
|
|
s, err := scanScheduleRow(rows)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out = append(out, *s)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// GetHostScheduleVersion returns the current version for a host,
|
|
// or 0 if no row exists yet.
|
|
func (st *Store) GetHostScheduleVersion(ctx context.Context, hostID string) (int64, error) {
|
|
var v int64
|
|
err := st.db.QueryRowContext(ctx,
|
|
`SELECT version FROM host_schedule_version WHERE host_id = ?`, hostID).Scan(&v)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return 0, nil
|
|
}
|
|
if err != nil {
|
|
return 0, fmt.Errorf("store: get schedule version: %w", err)
|
|
}
|
|
return v, nil
|
|
}
|
|
|
|
// SetHostAppliedScheduleVersion records the version the agent has
|
|
// confirmed via schedule.ack. Idempotent.
|
|
func (st *Store) SetHostAppliedScheduleVersion(ctx context.Context, hostID string, version int64) error {
|
|
_, err := st.db.ExecContext(ctx,
|
|
`UPDATE hosts SET applied_schedule_version = ? WHERE id = ?`,
|
|
version, hostID)
|
|
if err != nil {
|
|
return fmt.Errorf("store: set applied schedule version: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// bumpHostScheduleVersionTx upserts host_schedule_version, +1 each
|
|
// call. Caller owns the tx.
|
|
func bumpHostScheduleVersionTx(ctx context.Context, tx *sql.Tx, hostID string) error {
|
|
if _, err := tx.ExecContext(ctx,
|
|
`INSERT INTO host_schedule_version (host_id, version)
|
|
VALUES (?, 1)
|
|
ON CONFLICT(host_id) DO UPDATE SET version = version + 1`,
|
|
hostID); err != nil {
|
|
return fmt.Errorf("store: bump schedule version: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ----- scan helpers --------------------------------------------------
|
|
|
|
func scanSchedule(row *sql.Row) (*Schedule, error) {
|
|
return scanScheduleRow(row)
|
|
}
|
|
|
|
type scheduleScanner interface {
|
|
Scan(dest ...any) error
|
|
}
|
|
|
|
func scanScheduleRow(s scheduleScanner) (*Schedule, error) {
|
|
var (
|
|
out Schedule
|
|
paths, excludes, tags, retention, options string
|
|
createdAt, updatedAt string
|
|
enabled, manual int
|
|
)
|
|
err := s.Scan(&out.ID, &out.HostID, &out.Kind, &out.CronExpr,
|
|
&paths, &excludes, &tags, &retention, &options,
|
|
&out.PreHook, &out.PostHook, &enabled, &manual,
|
|
&createdAt, &updatedAt)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if paths != "" {
|
|
_ = json.Unmarshal([]byte(paths), &out.Paths)
|
|
}
|
|
if excludes != "" {
|
|
_ = json.Unmarshal([]byte(excludes), &out.Excludes)
|
|
}
|
|
if tags != "" {
|
|
_ = json.Unmarshal([]byte(tags), &out.Tags)
|
|
}
|
|
if retention != "" {
|
|
_ = json.Unmarshal([]byte(retention), &out.RetentionPolicy)
|
|
}
|
|
if options != "" {
|
|
_ = json.Unmarshal([]byte(options), &out.Options)
|
|
}
|
|
out.Enabled = enabled != 0
|
|
out.Manual = manual != 0
|
|
if t, err := time.Parse(time.RFC3339Nano, createdAt); err == nil {
|
|
out.CreatedAt = t
|
|
}
|
|
if t, err := time.Parse(time.RFC3339Nano, updatedAt); err == nil {
|
|
out.UpdatedAt = t
|
|
}
|
|
return &out, nil
|
|
}
|
|
|
|
func boolToInt(b bool) int {
|
|
if b {
|
|
return 1
|
|
}
|
|
return 0
|
|
}
|