diff --git a/src/baudolo/backup/snapshot.py b/src/baudolo/backup/snapshot.py index 1799c1b..b3bfec4 100644 --- a/src/baudolo/backup/snapshot.py +++ b/src/baudolo/backup/snapshot.py @@ -41,7 +41,10 @@ def _resolver(subject: str, root: str) -> Callable[[str], str]: def _btrfs(subject: str, name: str, run: Callable[[str], list[str]]) -> tuple[str, str]: - target = os.path.join(os.path.dirname(os.path.abspath(subject)), f".{name}") + # The snapshot goes inside the subject, never beside it: the kernel rejects + # a snapshot whose destination is on another filesystem, which is exactly + # what the parent directory is when the subject is a mountpoint of its own. + target = os.path.join(os.path.abspath(subject), f".{name}") run(f"btrfs subvolume snapshot -r {subject} {target}") return target, f"btrfs subvolume delete {target}" diff --git a/tests/unit/backup/test_app_snapshot.py b/tests/unit/backup/test_app_snapshot.py index 44ab446..9878b87 100644 --- a/tests/unit/backup/test_app_snapshot.py +++ b/tests/unit/backup/test_app_snapshot.py @@ -64,7 +64,7 @@ class TestSnapshotBranch(unittest.TestCase): def test_it_reads_from_the_snapshot_and_not_from_the_live_tree(self) -> None: source = drive(present=True)[0]["source"] - self.assertTrue(source.startswith("/var/lib/.baudolo-"), source) + self.assertTrue(source.startswith("/var/lib/docker/.baudolo-"), source) def test_it_compares_by_content_against_the_previous_generation(self) -> None: self.assertTrue(drive(present=True)[0]["authoritative"]) diff --git a/tests/unit/backup/test_snapshot.py b/tests/unit/backup/test_snapshot.py index d49d920..04901fd 100644 --- a/tests/unit/backup/test_snapshot.py +++ b/tests/unit/backup/test_snapshot.py @@ -22,27 +22,27 @@ class Runner: class TestBtrfs(unittest.TestCase): - def test_it_creates_a_read_only_snapshot_beside_the_subject(self) -> None: + def test_it_creates_a_read_only_snapshot_inside_the_subject(self) -> None: run = Runner() with volume_snapshot("btrfs", "/var/lib/docker", "20260731", run=run): pass self.assertEqual( run.calls[0], - "btrfs subvolume snapshot -r /var/lib/docker /var/lib/.baudolo-20260731", + "btrfs subvolume snapshot -r /var/lib/docker /var/lib/docker/.baudolo-20260731", ) def test_it_removes_the_snapshot_afterwards(self) -> None: run = Runner() with volume_snapshot("btrfs", "/var/lib/docker", "20260731", run=run): pass - self.assertEqual(run.calls[-1], "btrfs subvolume delete /var/lib/.baudolo-20260731") + self.assertEqual(run.calls[-1], "btrfs subvolume delete /var/lib/docker/.baudolo-20260731") def test_it_maps_a_volume_path_into_the_snapshot(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", + "/var/lib/docker/.baudolo-20260731/volumes/postgres_data/_data", ) def test_it_keeps_the_trailing_slash_rsync_reads_as_contents(self) -> None: @@ -50,7 +50,7 @@ class TestBtrfs(unittest.TestCase): 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/", + "/var/lib/docker/.baudolo-20260731/volumes/postgres_data/_data/", ) def test_it_removes_the_snapshot_even_when_the_body_raises(self) -> None: @@ -109,7 +109,7 @@ class TestRejections(unittest.TestCase): def test_the_subject_itself_resolves_to_the_snapshot_root(self) -> None: run = Runner() with volume_snapshot("btrfs", "/var/lib/docker", "20260731", run=run) as resolve: - self.assertEqual(resolve("/var/lib/docker"), "/var/lib/.baudolo-20260731") + self.assertEqual(resolve("/var/lib/docker"), "/var/lib/docker/.baudolo-20260731") class Busy(Runner):