No hosts configured yet.
diff --git a/src/pobsync_backend/templates/pobsync_backend/host_detail.html b/src/pobsync_backend/templates/pobsync_backend/host_detail.html index 9180799..e10f681 100644 --- a/src/pobsync_backend/templates/pobsync_backend/host_detail.html +++ b/src/pobsync_backend/templates/pobsync_backend/host_detail.html @@ -68,6 +68,30 @@ + {% if retention_warning.has_warning %} ++ This plan would delete {{ plan.delete|length }} snapshot(s), which exceeds the scheduled prune limit of + {{ scheduled_prune_limit }}. Scheduled pruning will refuse to apply this plan until the limit or retention + selection is adjusted. +
++ {{ plan.incomplete|length }} incomplete snapshot(s) exist for this host. Retention does not delete incomplete + snapshots automatically because they can indicate an interrupted backup that should be inspected first. +
+| Kind | Dirname | +Started | +Status | Reasons | ||
|---|---|---|---|---|---|---|
| {{ dirname }} | -{{ reasons|join:", " }} | +{{ snapshot.kind }} | +{{ snapshot.dirname }} | +{{ snapshot.dt }} | +{{ snapshot.status|default:"" }} | +{{ snapshot.reason }} |
| No snapshots matched this retention selection. | ||||||
| No snapshots matched this retention selection. | ||||||
| Dirname | +Started | +Status | +Reason | +Path | +
|---|---|---|---|---|
| {{ snapshot.dirname }} | +{{ snapshot.dt }} | +{{ snapshot.status|default:"" }} | +{{ snapshot.reason }} | +{{ snapshot.path }} | +
{{ result_json }}
diff --git a/src/pobsync_backend/tests/test_scheduler.py b/src/pobsync_backend/tests/test_scheduler.py
index 8cfd105..a19e989 100644
--- a/src/pobsync_backend/tests/test_scheduler.py
+++ b/src/pobsync_backend/tests/test_scheduler.py
@@ -8,7 +8,7 @@ from zoneinfo import ZoneInfo
from django.test import SimpleTestCase, TestCase
from pobsync_backend.management.commands.run_pobsync_scheduler import Command
-from pobsync_backend.models import HostConfig, ScheduleConfig
+from pobsync_backend.models import BackupRun, HostConfig, ScheduleConfig
from pobsync_backend.scheduler import due_key, is_due, next_due_after
@@ -64,3 +64,30 @@ class SchedulerCommandTests(TestCase):
self.assertEqual(call.call_count, 1)
schedule = ScheduleConfig.objects.get(host=host)
self.assertEqual(schedule.last_status, "success")
+
+ def test_run_due_records_warning_status_from_scheduled_backup_run(self) -> None:
+ host = HostConfig.objects.create(host="web-01", address="web-01.example.test")
+ ScheduleConfig.objects.create(host=host, cron_expr="* * * * *", prune=True, prune_max_delete=1)
+
+ def create_warning_run(*args, **kwargs) -> None:
+ BackupRun.objects.create(
+ host=host,
+ run_type=BackupRun.RunType.SCHEDULED,
+ status=BackupRun.Status.WARNING,
+ result={
+ "ok": True,
+ "prune": {
+ "ok": False,
+ "type": "ConfigError",
+ "error": "Refusing to delete 2 snapshots (exceeds --max-delete=1)",
+ },
+ },
+ )
+
+ command = Command()
+ with patch("pobsync_backend.management.commands.run_pobsync_scheduler.call_command", side_effect=create_warning_run):
+ count = command._run_due(prefix=Path("/opt/pobsync"), dry_run=False)
+
+ self.assertEqual(count, 1)
+ schedule = ScheduleConfig.objects.get(host=host)
+ self.assertEqual(schedule.last_status, "warning")
diff --git a/src/pobsync_backend/tests/test_sql_retention.py b/src/pobsync_backend/tests/test_sql_retention.py
index 32302ab..bdb903f 100644
--- a/src/pobsync_backend/tests/test_sql_retention.py
+++ b/src/pobsync_backend/tests/test_sql_retention.py
@@ -32,7 +32,10 @@ class SqlRetentionTests(TestCase):
self.assertEqual(plan["source"], "sql")
self.assertEqual(plan["keep"], [new.dirname])
+ self.assertEqual([item["dirname"] for item in plan["keep_items"]], [new.dirname])
self.assertEqual([item["dirname"] for item in plan["delete"]], [old.dirname])
+ self.assertEqual(plan["delete"][0]["reason"], "outside retention policy")
+ self.assertEqual(plan["incomplete"], [])
def test_plan_can_protect_base_snapshot_from_sql_relation(self) -> None:
host = HostConfig.objects.create(
@@ -85,6 +88,9 @@ class SqlRetentionTests(TestCase):
self.assertTrue(SnapshotRecord.objects.filter(pk=new.pk).exists())
self.assertFalse(SnapshotRecord.objects.filter(pk=old.pk).exists())
self.assertEqual(result["deleted"], [{"dirname": old.dirname, "kind": "scheduled", "path": str(old_dir)}])
+ self.assertEqual(result["planned_delete_count"], 1)
+ self.assertEqual(result["max_delete"], 1)
+ self.assertEqual(result["incomplete_ignored_count"], 0)
def test_apply_deletes_snapshot_with_readonly_data_directory(self) -> None:
with TemporaryDirectory() as tmp:
diff --git a/src/pobsync_backend/tests/test_views.py b/src/pobsync_backend/tests/test_views.py
index 9c66eee..e5f80b4 100644
--- a/src/pobsync_backend/tests/test_views.py
+++ b/src/pobsync_backend/tests/test_views.py
@@ -99,6 +99,35 @@ class ViewTests(TestCase):
self.assertContains(response, "manual")
self.assertContains(response, "1000")
+ def test_dashboard_surfaces_retention_warnings(self) -> None:
+ self.client.force_login(self.staff_user)
+ host = HostConfig.objects.create(
+ host="web-01",
+ address="web-01.example.test",
+ retention_daily=0,
+ retention_weekly=0,
+ retention_monthly=0,
+ retention_yearly=0,
+ )
+ ScheduleConfig.objects.create(host=host, cron_expr="15 2 * * *", enabled=True, prune=True, prune_max_delete=1)
+ self._snapshot(host, "20260517-021500Z__OLDSNP1")
+ self._snapshot(host, "20260518-021500Z__OLDSNP2")
+ self._snapshot(host, "20260519-021500Z__NEWSNAP")
+ SnapshotRecord.objects.create(
+ host=host,
+ kind=SnapshotRecord.Kind.INCOMPLETE,
+ dirname="20260519-031500Z__BROKEN01",
+ path=f"/backups/{host.host}/.incomplete/20260519-031500Z__BROKEN01",
+ status="failed",
+ started_at=datetime(2026, 5, 19, 3, 15, tzinfo=timezone.utc),
+ )
+
+ response = self.client.get(reverse("dashboard"))
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, "Scheduled prune would delete 2 snapshot(s), above max 1.")
+ self.assertContains(response, "1 incomplete snapshot(s) need review.")
+
def test_dashboard_links_latest_snapshot_for_each_host(self) -> None:
self.client.force_login(self.staff_user)
host = HostConfig.objects.create(host="web-01", address="web-01.example.test")
@@ -1168,9 +1197,15 @@ class ViewTests(TestCase):
"hint": "Check network connectivity.",
},
"prune": {
- "ok": False,
- "type": "ConfigError",
- "error": "Deletion blocked by --max-delete=0",
+ "ok": True,
+ "source": "sql",
+ "kind": "scheduled",
+ "planned_delete_count": 1,
+ "max_delete": 1,
+ "protect_bases": True,
+ "incomplete_ignored_count": 1,
+ "deleted": [{"dirname": "20260518-021500Z__OLD"}],
+ "actions": ["deleted scheduled 20260518-021500Z__OLD"],
},
},
)
@@ -1182,7 +1217,42 @@ class ViewTests(TestCase):
self.assertContains(response, "transport")
self.assertContains(response, "Check network connectivity.")
self.assertContains(response, "Retention")
- self.assertContains(response, "Deletion blocked by --max-delete=0")
+ self.assertContains(response, "Planned deletions")
+ self.assertContains(response, "Max delete")
+ self.assertContains(response, "Protect bases")
+ self.assertContains(response, "Incomplete ignored")
+ self.assertContains(response, "deleted scheduled 20260518-021500Z__OLD")
+
+ def test_run_detail_surfaces_host_retention_warnings(self) -> None:
+ self.client.force_login(self.staff_user)
+ host = HostConfig.objects.create(
+ host="web-01",
+ address="web-01.example.test",
+ retention_daily=0,
+ retention_weekly=0,
+ retention_monthly=0,
+ retention_yearly=0,
+ )
+ ScheduleConfig.objects.create(host=host, cron_expr="15 2 * * *", enabled=True, prune=True, prune_max_delete=1)
+ self._snapshot(host, "20260517-021500Z__OLDSNP1")
+ self._snapshot(host, "20260518-021500Z__OLDSNP2")
+ self._snapshot(host, "20260519-021500Z__NEWSNAP")
+ SnapshotRecord.objects.create(
+ host=host,
+ kind=SnapshotRecord.Kind.INCOMPLETE,
+ dirname="20260519-031500Z__BROKEN01",
+ path=f"/backups/{host.host}/.incomplete/20260519-031500Z__BROKEN01",
+ status="failed",
+ started_at=datetime(2026, 5, 19, 3, 15, tzinfo=timezone.utc),
+ )
+ run = BackupRun.objects.create(host=host, status=BackupRun.Status.SUCCESS, result={"ok": True})
+
+ response = self.client.get(reverse("run_detail", args=[run.id]))
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, "Retention Warnings")
+ self.assertContains(response, "Scheduled pruning for this host would delete 2 snapshot(s)")
+ self.assertContains(response, "1 incomplete snapshot(s) exist for this host")
def test_run_detail_infers_rsync_log_from_snapshot_path(self) -> None:
self.client.force_login(self.staff_user)
@@ -1351,6 +1421,32 @@ class ViewTests(TestCase):
self.assertContains(response, new_snapshot.dirname)
self.assertContains(response, "newest")
self.assertContains(response, "Would Delete")
+ self.assertContains(response, "outside retention policy")
+ self.assertContains(response, "Confirm delete count")
+ self.assertContains(response, "Type 1 to confirm the current number of planned deletions.")
+
+ def test_retention_plan_warns_when_scheduled_prune_limit_is_exceeded(self) -> None:
+ self.client.force_login(self.staff_user)
+ host = HostConfig.objects.create(
+ host="web-01",
+ address="web-01.example.test",
+ retention_daily=0,
+ retention_weekly=0,
+ retention_monthly=0,
+ retention_yearly=0,
+ )
+ ScheduleConfig.objects.create(host=host, cron_expr="15 2 * * *", enabled=True, prune=True, prune_max_delete=1)
+ self._snapshot(host, "20260517-021500Z__OLDSNP1")
+ self._snapshot(host, "20260518-021500Z__OLDSNP2")
+ self._snapshot(host, "20260519-021500Z__NEWSNAP")
+
+ response = self.client.get(reverse("host_retention_plan", args=[host.host]))
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, "Scheduled Prune Limit")
+ self.assertContains(response, "would delete 2 snapshot(s)")
+ self.assertContains(response, "scheduled prune limit of")
+ self.assertContains(response, "Schedule max delete: 1")
def test_retention_plan_can_enable_base_protection(self) -> None:
self.client.force_login(self.staff_user)
@@ -1371,8 +1467,58 @@ class ViewTests(TestCase):
self.assertEqual(response.status_code, 200)
self.assertContains(response, "Protect bases: yes")
+ self.assertContains(response, "Base snapshots referenced by kept snapshots")
self.assertContains(response, f"base-of:{child.dirname}")
+ def test_retention_plan_surfaces_incomplete_snapshots_without_deleting_them(self) -> None:
+ self.client.force_login(self.staff_user)
+ host = HostConfig.objects.create(
+ host="web-01",
+ address="web-01.example.test",
+ retention_daily=0,
+ retention_weekly=0,
+ retention_monthly=0,
+ retention_yearly=0,
+ )
+ self._snapshot(host, "20260518-021500Z__OLDSNAP")
+ self._snapshot(host, "20260519-021500Z__NEWSNAP")
+ SnapshotRecord.objects.create(
+ host=host,
+ kind=SnapshotRecord.Kind.INCOMPLETE,
+ dirname="20260519-031500Z__BROKEN01",
+ path=f"/backups/{host.host}/.incomplete/20260519-031500Z__BROKEN01",
+ status="failed",
+ started_at=datetime(2026, 5, 19, 3, 15, tzinfo=timezone.utc),
+ )
+
+ response = self.client.get(reverse("host_retention_plan", args=[host.host]))
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, "Incomplete Snapshots")
+ self.assertContains(response, "20260519-031500Z__BROKEN01")
+ self.assertContains(response, "excluded from retention cleanup")
+
+ def test_host_detail_surfaces_retention_warnings(self) -> None:
+ self.client.force_login(self.staff_user)
+ host = HostConfig.objects.create(
+ host="web-01",
+ address="web-01.example.test",
+ retention_daily=0,
+ retention_weekly=0,
+ retention_monthly=0,
+ retention_yearly=0,
+ )
+ ScheduleConfig.objects.create(host=host, cron_expr="15 2 * * *", enabled=True, prune=True, prune_max_delete=1)
+ self._snapshot(host, "20260517-021500Z__OLDSNP1")
+ self._snapshot(host, "20260518-021500Z__OLDSNP2")
+ self._snapshot(host, "20260519-021500Z__NEWSNAP")
+
+ response = self.client.get(reverse("host_detail", args=[host.host]))
+
+ self.assertEqual(response.status_code, 200)
+ self.assertContains(response, "Retention Warnings")
+ self.assertContains(response, "Scheduled pruning would delete 2 snapshot(s), above max delete")
+
def test_retention_plan_rejects_invalid_kind(self) -> None:
self.client.force_login(self.staff_user)
host = HostConfig.objects.create(host="web-01", address="web-01.example.test")
@@ -1412,6 +1558,7 @@ class ViewTests(TestCase):
"kind": "scheduled",
"max_delete": "1",
"confirm_host": host.host,
+ "confirm_delete_count": "1",
},
follow=True,
)
@@ -1435,6 +1582,7 @@ class ViewTests(TestCase):
"kind": "scheduled",
"max_delete": "1",
"confirm_host": "wrong",
+ "confirm_delete_count": "1",
},
follow=True,
)
@@ -1443,6 +1591,34 @@ class ViewTests(TestCase):
self.assertContains(response, "Retention apply confirmation is invalid.")
self.assertEqual(SnapshotRecord.objects.count(), 1)
+ def test_retention_apply_rejects_mismatched_delete_count_confirmation(self) -> None:
+ self.client.force_login(self.staff_user)
+ host = HostConfig.objects.create(
+ host="web-01",
+ address="web-01.example.test",
+ retention_daily=0,
+ retention_weekly=0,
+ retention_monthly=0,
+ retention_yearly=0,
+ )
+ self._snapshot(host, "20260518-021500Z__OLDSNAP")
+ self._snapshot(host, "20260519-021500Z__NEWSNAP")
+
+ response = self.client.post(
+ reverse("apply_host_retention", args=[host.host]),
+ {
+ "kind": "scheduled",
+ "max_delete": "1",
+ "confirm_host": host.host,
+ "confirm_delete_count": "0",
+ },
+ follow=True,
+ )
+
+ self.assertRedirects(response, reverse("host_retention_plan", args=[host.host]))
+ self.assertContains(response, "Retention apply confirmation is invalid.")
+ self.assertEqual(SnapshotRecord.objects.count(), 2)
+
def test_retention_apply_requires_post(self) -> None:
self.client.force_login(self.staff_user)
host = HostConfig.objects.create(host="web-01", address="web-01.example.test")
diff --git a/src/pobsync_backend/views.py b/src/pobsync_backend/views.py
index 524ea23..cf469a4 100644
--- a/src/pobsync_backend/views.py
+++ b/src/pobsync_backend/views.py
@@ -55,6 +55,7 @@ def dashboard(request):
.first()
)
host_config.next_run_at = _next_run_for_host(host_config)
+ host_config.retention_warning = _retention_warning_for_host(host_config, _schedule_for_host(host_config))
stats_summary = collect_dashboard_stats(hosts=hosts, global_config=global_config)
context = {
"hosts": hosts,
@@ -274,6 +275,7 @@ def host_detail(request, host: str):
context = {
"host": host_config,
"schedule": schedule,
+ "retention_warning": _retention_warning_for_host(host_config, schedule),
"next_run_at": _next_run_for_schedule(schedule, host_config),
"scheduler_timezone": timezone.get_current_timezone_name(),
"discovery": inspect_snapshot_discovery(host=host_config),
@@ -427,6 +429,7 @@ def run_detail(request, run_id: int):
"failure_summary": failure.get("message") or failure.get("summary") or "",
"prune_result": prune_result,
"has_prune_result": bool(prune_result),
+ "retention_warning": _retention_warning_for_host(run.host, _schedule_for_host(run.host)),
"rsync_log_path": str(rsync_log_path) if rsync_log_path is not None else "",
"rsync_log_exists": bool(rsync_log_path and rsync_log_path.exists()),
"rsync_log_tail": rsync_log_tail,
@@ -526,17 +529,25 @@ def host_retention_plan(request, host: str):
except PobsyncError as exc:
messages.error(request, str(exc))
return redirect("host_detail", host=host_config.host)
+ schedule = _schedule_for_host(host_config)
+ scheduled_prune_limit = schedule.prune_max_delete if schedule and schedule.prune else None
+ delete_count = len(plan["delete"])
context = {
"host": host_config,
"kind": kind,
"protect_bases": protect_bases,
"plan": plan,
+ "schedule": schedule,
+ "scheduled_prune_limit": scheduled_prune_limit,
+ "scheduled_prune_exceeded": scheduled_prune_limit is not None and delete_count > scheduled_prune_limit,
"apply_form": RetentionApplyForm(
host_name=host_config.host,
+ expected_delete_count=delete_count,
initial={
"kind": kind,
"protect_bases": protect_bases,
- "max_delete": len(plan["delete"]),
+ "max_delete": delete_count,
+ "confirm_delete_count": delete_count,
},
),
}
@@ -547,7 +558,26 @@ def host_retention_plan(request, host: str):
@require_POST
def apply_host_retention(request, host: str):
host_config = get_object_or_404(HostConfig, host=host)
- form = RetentionApplyForm(request.POST, host_name=host_config.host)
+ raw_kind = request.POST.get("kind", "scheduled")
+ raw_protect_bases = request.POST.get("protect_bases") in {"1", "true", "on", "yes"}
+ expected_delete_count = None
+ if raw_kind in {"scheduled", "manual", "all"}:
+ try:
+ plan = run_sql_retention_plan(
+ host=host_config.host,
+ kind=raw_kind,
+ protect_bases=raw_protect_bases,
+ )
+ except PobsyncError as exc:
+ messages.error(request, str(exc))
+ return redirect("host_retention_plan", host=host_config.host)
+ expected_delete_count = len(plan.get("delete") or [])
+
+ form = RetentionApplyForm(
+ request.POST,
+ host_name=host_config.host,
+ expected_delete_count=expected_delete_count,
+ )
if not form.is_valid():
messages.error(request, "Retention apply confirmation is invalid.")
return redirect("host_retention_plan", host=host_config.host)
@@ -652,6 +682,43 @@ def _next_run_for_schedule(schedule: ScheduleConfig | None, host_config: HostCon
return None
+def _retention_warning_for_host(host_config: HostConfig, schedule: ScheduleConfig | None) -> dict[str, object]:
+ incomplete_count = host_config.snapshots.filter(kind=SnapshotRecord.Kind.INCOMPLETE).count()
+ warning: dict[str, object] = {
+ "has_warning": incomplete_count > 0,
+ "incomplete_count": incomplete_count,
+ }
+ if schedule is None or not schedule.prune or not host_config.enabled:
+ return warning
+ try:
+ plan = run_sql_retention_plan(
+ host=host_config.host,
+ kind="scheduled",
+ protect_bases=bool(schedule.prune_protect_bases),
+ )
+ except PobsyncError as exc:
+ warning.update(
+ {
+ "has_warning": True,
+ "error": str(exc),
+ }
+ )
+ return warning
+
+ delete_count = len(plan.get("delete") or [])
+ warning.update(
+ {
+ "delete_count": delete_count,
+ "max_delete": schedule.prune_max_delete,
+ "protect_bases": bool(schedule.prune_protect_bases),
+ "prune_exceeded": delete_count > schedule.prune_max_delete,
+ }
+ )
+ if warning["prune_exceeded"]:
+ warning["has_warning"] = True
+ return warning
+
+
def _default_schedule_initial() -> dict[str, object]:
return {
"cron_expr": "15 2 * * *",