mirror of
https://github.com/kevinveenbirkenbach/docker-volume-backup.git
synced 2026-08-01 12:34:50 +00:00
fix(backup): make snapshot backups restorable and non-fatal to teardown
Four defects in the snapshot mode 3.2.0 introduced. The resolver dropped the trailing separator get_storage_path puts on a volume path, because os.path.abspath strips it. rsync reads "dir" as "copy the directory" where "dir/" means "copy its contents", so every snapshot generation landed at <volume>/files/_data/... while the live path lands at <volume>/files/... . Restores read the live layout, and --link-dest found nothing to match against the previous generation. The e2e never caught it because its driver appended the separator by hand. Snapshot teardown was fatal and masking. A busy `btrfs subvolume delete` raised out of the finally, which skipped the generation stamp and the compose handling on a run whose data was already complete, and replaced whatever the body had raised. The leftover is reported instead; removing it is a cleanup problem, not a reason to discard a good generation. A volume created after the snapshot was taken aborted the whole run: the volume list is enumerated inside the snapshot context, and nothing is stopped in snapshot mode, so the host keeps creating volumes for the duration of the copy. Such a volume is now copied live with a warning, which is exactly what the pre-snapshot code did for it. The snapshot pass compares by content again. 3.2.0 dropped --checksum because a snapshot source cannot move, which is true, but the comparison that matters is against --link-dest: a file that changed while keeping its size and whole-second mtime was hard-linked stale out of the previous generation, and the single snapshot pass had no authoritative pass to repair it the way the live path does. It is still one pass against two. --hard-restart-projects is refused alongside --snapshot, the same way --shutdown already is: the flag exists for stacks whose database cannot be backed up hot, which is what a snapshot removes. Tests: the trailing separator, both teardown behaviours, the new refusal, and app.main driving the snapshot branch - the caller that runs in production, which no test had exercised and where the layout defect therefore stayed invisible. The e2e driver now feeds the resolver the string shape get_storage_path really produces. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -4,6 +4,7 @@ from __future__ import annotations
|
||||
|
||||
import unittest
|
||||
|
||||
from baudolo.backup.shell import BackupException
|
||||
from baudolo.backup.snapshot import SnapshotError, volume_snapshot
|
||||
|
||||
|
||||
@@ -44,6 +45,14 @@ class TestBtrfs(unittest.TestCase):
|
||||
"/var/lib/.baudolo-20260731/volumes/postgres_data/_data",
|
||||
)
|
||||
|
||||
def test_it_keeps_the_trailing_slash_rsync_reads_as_contents(self) -> None:
|
||||
run = Runner()
|
||||
with volume_snapshot("btrfs", "/var/lib/docker", "20260731", run=run) as resolve:
|
||||
self.assertEqual(
|
||||
resolve("/var/lib/docker/volumes/postgres_data/_data/"),
|
||||
"/var/lib/.baudolo-20260731/volumes/postgres_data/_data/",
|
||||
)
|
||||
|
||||
def test_it_removes_the_snapshot_even_when_the_body_raises(self) -> None:
|
||||
run = Runner()
|
||||
with self.assertRaises(ZeroDivisionError):
|
||||
@@ -103,5 +112,23 @@ class TestRejections(unittest.TestCase):
|
||||
self.assertEqual(resolve("/var/lib/docker"), "/var/lib/.baudolo-20260731")
|
||||
|
||||
|
||||
class Busy(Runner):
|
||||
def __call__(self, command: str) -> list[str]:
|
||||
if command.startswith("btrfs subvolume delete"):
|
||||
raise BackupException("target is busy")
|
||||
return super().__call__(command)
|
||||
|
||||
|
||||
class TestRemovalFailure(unittest.TestCase):
|
||||
def test_a_failed_removal_does_not_fail_a_completed_run(self) -> None:
|
||||
with volume_snapshot("btrfs", "/var/lib/docker", "20260731", run=Busy()):
|
||||
pass
|
||||
|
||||
def test_a_failed_removal_does_not_mask_the_body(self) -> None:
|
||||
with self.assertRaises(ZeroDivisionError):
|
||||
with volume_snapshot("btrfs", "/var/lib/docker", "20260731", run=Busy()):
|
||||
raise ZeroDivisionError
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user