mirror of
https://github.com/kevinveenbirkenbach/docker-volume-backup.git
synced 2026-08-20 21:22:54 +00:00
Kevin Veen-Birkenbach
1d86277a94
The backup built command strings and handed them to shell=True, so four interpolated values per dump - user, password, container, database - were each a way out of the command. validate_database covered one of them since the previous commit; now there is nothing to cover: every command is an argv list, and a value can only ever be an argument. execute_to_file absorbs the atomic dump write. The shell redirect into <file>.tmp and the separate mv process become a Python file handle and os.replace, and a failing dump deletes its partial file instead of leaving it. PGPASSWORD moves out of the command string into the child's environment, where a process listing does not show it. docker exec is built in one place, docker_exec_argv; db.py's three hand-built copies and the probe use it. The dead docker_volume_exists goes - never called, and the restore side owns the living twin. The rsync quoting in --link-dest falls away: inside an argv it would have become part of the path. The snapshot module's injected runner changes type with it, which the three e2e drivers implement - the first conversion missed them, btrfs ran with no arguments, and the e2e caught it. Marked breaking for that contract: any external runner injected into volume_snapshot must now accept a list. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
65 lines
2.0 KiB
Python
65 lines
2.0 KiB
Python
"""Exercise volume_snapshot against a real filesystem, from inside a container.
|
|
|
|
Runs where loop devices exist. Prints one PASS/FAIL line per assertion and exits
|
|
non-zero on the first failure, so the calling test can surface the reason.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
sys.path.insert(0, "/src")
|
|
|
|
from baudolo.backup.snapshot import SnapshotError, volume_snapshot
|
|
|
|
KIND = sys.argv[1]
|
|
SUBJECT = sys.argv[2]
|
|
EXPECT = sys.argv[3]
|
|
|
|
|
|
def shell(command: list[str]) -> list[str]:
|
|
proc = subprocess.run(command, capture_output=True, text=True, check=False)
|
|
if proc.returncode != 0:
|
|
raise SnapshotError(
|
|
f"{' '.join(command)} exited {proc.returncode}: {proc.stderr.strip()}"
|
|
)
|
|
return proc.stdout.splitlines()
|
|
|
|
|
|
def check(label: str, condition: bool) -> None:
|
|
print(f"{'PASS' if condition else 'FAIL'} {label}", flush=True)
|
|
if not condition:
|
|
sys.exit(1)
|
|
|
|
|
|
volume = Path(SUBJECT) / "volumes" / "demo" / "_data"
|
|
volume.mkdir(parents=True, exist_ok=True)
|
|
(volume / "state").write_text("before\n")
|
|
|
|
if EXPECT == "unsupported":
|
|
try:
|
|
with volume_snapshot(KIND, SUBJECT, "e2e", run=shell):
|
|
check("snapshot on an unsupported filesystem must not succeed", False)
|
|
except SnapshotError as exc:
|
|
check(f"refused loudly: {str(exc)[:60]}", True)
|
|
sys.exit(0)
|
|
|
|
with volume_snapshot(KIND, SUBJECT, "e2e", run=shell) as resolve:
|
|
frozen = Path(resolve(str(volume))) / "state"
|
|
check("the snapshot exposes the volume", frozen.is_file())
|
|
check("the snapshot carries the content", frozen.read_text() == "before\n")
|
|
|
|
(volume / "state").write_text("after\n")
|
|
check("a later write does not reach the snapshot", frozen.read_text() == "before\n")
|
|
check("the live tree did change", (volume / "state").read_text() == "after\n")
|
|
|
|
root = Path(resolve(SUBJECT))
|
|
|
|
check(
|
|
"the snapshot is removed afterwards",
|
|
not root.exists() or not (root / "volumes").exists(),
|
|
)
|
|
print("ALL OK", flush=True)
|