steve/restic-manager
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases 1 Wiki Activity

P2 redesign · phase 2: store rewrite — sources, slim schedules, repo maintenance

Browse Source 
Go-side data model rebuilt against migration 0008. The fat-Schedule
shape (paths/excludes/tags/retention/manual/kind/options/hooks) is
gone; that surface lives on source_groups now.

* store/types.go
  - Schedule slimmed to {id, host_id, cron, enabled, source_group_ids,
    timestamps}. SourceGroupIDs populated by Get/List, accepted on
    Create/Update so callers pass desired junction state in one shape.
  - SourceGroup added: name (= snapshot tag), includes/excludes,
    retention_policy, retry_max + retry_backoff_seconds, cached
    conflict_dimension.
  - HostRepoMaintenance added: forget/prune/check cadences + enabled.
  - PendingRun added: offline-retry queue.
  - Host loses RepoInitialisedAt; gains BandwidthUpKBps + BandwidthDownKBps.
  - RetentionPolicy moves home from "schedule field" to "source group
    field" but the type itself + Summary() method unchanged.

* store/sources.go (new) — CRUD + GetByName + ConflictDimension cache.
  Group writes bump host_schedule_version; conflict cache writes don't
  (server-internal projection, agent doesn't see it).
* store/maintenance.go (new) — CreateDefault is idempotent (INSERT OR
  IGNORE). UpdateRepoMaintenance doesn't bump schedule version because
  these run on the server's own ticker, not the agent's local cron.
* store/pending.go (new) — Enqueue / DueRunsForRetry / Bump / Delete.
* store/schedules.go — rewritten for slim shape + junction CRUD.
  Update wipes the schedule_source_groups junction wholesale and
  re-inserts (simpler than diffing). Adds SchedulesUsingGroup for
  retention-conflict detection + UI labels.
* store/hosts.go — drops repo_initialised_at scan, adds bandwidth scan.
  New SetHostBandwidth helper.

* HTTP layer — temporarily stubbed during this rewrite (501 returns
  with redesign_in_progress error code). Phase 3 fills these in
  against the new shape:
    - schedules.go REST CRUD
    - schedule_push.go agent reconciliation
    - ui_schedules.go HTML form CRUD
  Run-now-per-host + Init-repo handlers in ui_handlers.go also stubbed
  — both go away in the new model (Run-now per source group; auto-init
  at host enrolment).

* enrollment.go — replaces "seed manual schedule from typed paths"
  with "seed default source group + repo-maintenance row." The default
  group gets the typed paths as its includes; operator edits later
  via Sources tab.

* ws/handler.go — drops the MarkHostRepoInitialised projection (column
  is gone; auto-init makes it derivable from latest init job's status).

Tests:
* store: existing schedule test rewritten for slim shape + junction;
  new sources_test.go covers source-group CRUD, name uniqueness,
  conflict cache, repo-maintenance defaults + idempotent seed,
  pending-runs queue lifecycle.
* http: schedules_test.go and schedule_push_test.go deleted — both
  exercised the obsolete fat-schedule API. Phase 3 rewrites them
  against the new endpoints.

go test ./... green. cmd/server + cmd/agent build. The UI is broken
end-to-end (schedules / sources / repo tabs all hit 501 stubs); Phase 3
restores REST + on-the-wire reconciliation; Phase 4 rewires the UI
templates against the new model.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Steve Cliff
2026-05-02 21:30:41 +01:00
parent e717b6998c
commit e7eea7afac
16 changed files with 1076 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/store/schedules_test.go
+71 -27
View File
@@ -21,29 +21,37 @@ func makeSchedHost(t *testing.T, s *Store) string {
return id
}
// makeGroup is a minimal source-group helper for schedule tests
// (schedules need at least one group to point at).
func makeGroup(t *testing.T, s *Store, hostID, name, id string) string {
t.Helper()
if err := s.CreateSourceGroup(context.Background(), &SourceGroup{
ID: id, HostID: hostID, Name: name,
Includes: []string{"/etc"},
}); err != nil {
t.Fatalf("create group %s: %v", name, err)
}
return id
}
func TestSchedulesCRUDAndVersionBump(t *testing.T) {
t.Parallel()
s := openTestStore(t)
ctx := context.Background()
hostID := makeSchedHost(t, s)
gid := makeGroup(t, s, hostID, "default", "01HSCHEDGRP00000000000001")
// Initial version is 0 (no row).
v, err := s.GetHostScheduleVersion(ctx, hostID)
if err != nil {
t.Fatal(err)
}
if v != 0 {
t.Fatalf("initial version: got %d, want 0", v)
// Group creation already bumped version to 1.
v, _ := s.GetHostScheduleVersion(ctx, hostID)
if v != 1 {
t.Fatalf("version after group create: got %d, want 1", v)
}
keepLast := 7
sched := Schedule{
ID: "01SCHED000000000000000001", HostID: hostID,
Kind: "backup", CronExpr: "0 3 * * *",
Paths: []string{"/etc", "/home"},
Tags: []string{"nightly"},
RetentionPolicy: RetentionPolicy{KeepLast: &keepLast},
Enabled: true,
CronExpr: "0 3 * * *",
Enabled: true,
SourceGroupIDs: []string{gid},
}
if err := s.CreateSchedule(ctx, &sched); err != nil {
t.Fatalf("create: %v", err)
@@ -53,37 +61,33 @@ func TestSchedulesCRUDAndVersionBump(t *testing.T) {
}
v, _ = s.GetHostScheduleVersion(ctx, hostID)
if v != 1 {
t.Fatalf("version after create: got %d, want 1", v)
if v != 2 {
t.Fatalf("version after schedule create: got %d, want 2", v)
}
// Round-trip read.
// Round-trip read — junction populated.
got, err := s.GetSchedule(ctx, hostID, sched.ID)
if err != nil {
t.Fatalf("get: %v", err)
}
if got.CronExpr != "0 3 * * *" || len(got.Paths) != 2 {
t.Fatalf("round-trip lost data: %+v", got)
}
if got.RetentionPolicy.KeepLast == nil || *got.RetentionPolicy.KeepLast != 7 {
t.Fatalf("retention round-trip: %+v", got.RetentionPolicy)
if got.CronExpr != "0 3 * * *" || len(got.SourceGroupIDs) != 1 || got.SourceGroupIDs[0] != gid {
t.Fatalf("round-trip: %+v", got)
}
// List sees it.
list, err := s.ListSchedulesByHost(ctx, hostID)
if err != nil || len(list) != 1 || list[0].ID != sched.ID {
t.Fatalf("list: err=%v rows=%v", err, list)
}
// Update bumps version.
// Update — flip enabled, swap junction (re-add same gid). Version bumps.
sched.CronExpr = "*/30 * * * *"
sched.Enabled = false
if err := s.UpdateSchedule(ctx, &sched); err != nil {
t.Fatalf("update: %v", err)
}
v, _ = s.GetHostScheduleVersion(ctx, hostID)
if v != 2 {
t.Fatalf("version after update: got %d, want 2", v)
if v != 3 {
t.Fatalf("version after update: got %d, want 3", v)
}
got, _ = s.GetSchedule(ctx, hostID, sched.ID)
if got.CronExpr != "*/30 * * * *" || got.Enabled {
@@ -95,14 +99,54 @@ func TestSchedulesCRUDAndVersionBump(t *testing.T) {
t.Fatalf("delete: %v", err)
}
v, _ = s.GetHostScheduleVersion(ctx, hostID)
if v != 3 {
t.Fatalf("version after delete: got %d, want 3", v)
if v != 4 {
t.Fatalf("version after delete: got %d, want 4", v)
}
if err := s.DeleteSchedule(ctx, hostID, sched.ID); !errors.Is(err, ErrNotFound) {
t.Fatalf("delete after delete: want ErrNotFound, got %v", err)
}
}
func TestSchedulesUsingGroup(t *testing.T) {
t.Parallel()
s := openTestStore(t)
ctx := context.Background()
hostID := makeSchedHost(t, s)
g1 := makeGroup(t, s, hostID, "default", "01HUSEGRPGRP000000000001")
g2 := makeGroup(t, s, hostID, "databases", "01HUSEGRPGRP000000000002")
// Schedule A points at g1 only; Schedule B points at both.
if err := s.CreateSchedule(ctx, &Schedule{
ID: "01HUSEGRPSCHED0000000001", HostID: hostID,
CronExpr: "@hourly", Enabled: true,
SourceGroupIDs: []string{g1},
}); err != nil {
t.Fatal(err)
}
if err := s.CreateSchedule(ctx, &Schedule{
ID: "01HUSEGRPSCHED0000000002", HostID: hostID,
CronExpr: "0 3 * * *", Enabled: true,
SourceGroupIDs: []string{g1, g2},
}); err != nil {
t.Fatal(err)
}
g1Sched, err := s.SchedulesUsingGroup(ctx, g1)
if err != nil {
t.Fatal(err)
}
if len(g1Sched) != 2 {
t.Fatalf("g1 should be in 2 schedules, got %d", len(g1Sched))
}
g2Sched, err := s.SchedulesUsingGroup(ctx, g2)
if err != nil {
t.Fatal(err)
}
if len(g2Sched) != 1 {
t.Fatalf("g2 should be in 1 schedule, got %d", len(g2Sched))
}
}
func TestSetHostAppliedScheduleVersion(t *testing.T) {
t.Parallel()
s := openTestStore(t)