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>
91 lines
2.7 KiB
Python
91 lines
2.7 KiB
Python
"""Show what a real snapshot holds for a volume that has its own storage.
|
|
|
|
Runs inside the privileged container that built the btrfs subject. Prints one
|
|
PASS/FAIL line per assertion and exits non-zero on the first failure.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
sys.path.insert(0, "/src")
|
|
|
|
from baudolo.backup.snapshot import (
|
|
SnapshotError,
|
|
snapshot_source,
|
|
unsnapshotted,
|
|
volume_snapshot,
|
|
)
|
|
from baudolo.backup.volume import Backing
|
|
|
|
SUBJECT = sys.argv[1]
|
|
|
|
|
|
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)
|
|
|
|
|
|
def volume(name: str, payload: str) -> Path:
|
|
path = Path(SUBJECT) / "volumes" / name / "_data"
|
|
path.mkdir(parents=True, exist_ok=True)
|
|
(path / "state").write_text(payload)
|
|
return path
|
|
|
|
|
|
plain = volume("plain", "plain-payload")
|
|
own = Path(SUBJECT) / "volumes" / "own" / "_data"
|
|
own.mkdir(parents=True, exist_ok=True)
|
|
shell(["mount", "-t", "tmpfs", "tmpfs", own])
|
|
(own / "state").write_text("own-payload")
|
|
|
|
check("a plain volume is captured", unsnapshotted(Backing(str(plain)), SUBJECT) is None)
|
|
check(
|
|
"a volume on a mount of its own is not",
|
|
unsnapshotted(Backing(str(own)), SUBJECT) is not None,
|
|
)
|
|
check(
|
|
"a declared backing store is not, mounted or not",
|
|
unsnapshotted(Backing(str(plain), options={"type": "nfs"}), SUBJECT) is not None,
|
|
)
|
|
check(
|
|
"a foreign driver is not",
|
|
unsnapshotted(Backing(str(plain), driver="rexray"), SUBJECT) is not None,
|
|
)
|
|
|
|
with volume_snapshot("btrfs", SUBJECT, "e2e", run=shell) as resolve:
|
|
frozen_plain = Path(resolve(str(plain)))
|
|
frozen_own = Path(resolve(str(own)))
|
|
|
|
check(
|
|
"the snapshot carries the plain volume",
|
|
(frozen_plain / "state").read_text() == "plain-payload",
|
|
)
|
|
check(
|
|
"the snapshot shows the other volume as an empty directory",
|
|
frozen_own.is_dir() and not any(frozen_own.iterdir()),
|
|
)
|
|
|
|
source, reason = snapshot_source(resolve, Backing(str(plain)), SUBJECT)
|
|
check(
|
|
"the plain volume is read from the snapshot",
|
|
source is not None and source.rstrip("/") == str(frozen_plain),
|
|
)
|
|
|
|
source, reason = snapshot_source(resolve, Backing(str(own)), SUBJECT)
|
|
check(f"the other volume degrades to live: {reason[:60]}", source is None)
|
|
|
|
print("ALL OK", flush=True)
|