Files
computer-playbook/cli/administration/recover/full.py
kevinveenbirkenbachandClaude Opus 5.5 21eba1e88f fix(backup): carry hard links, ACLs and xattrs on every backup and recover hop
baudolo 7.1.x writes volume generations with `rsync -aHAX`, so the
producing host keeps `user.*` extended attributes (OpenCloud keeps its
storage metadata in `user.oc.*`). Every later copy dropped them again,
because none of the other rsync calls passed `-X` (nor `-A`/`-H`):

- NFS export snapshots (svc-bkp-nfs-2-local `script.sh`),
- the backup host's pull (svc-bkp-remote-2-local `pull_specific_host.py`),
- the device sync (svc-bkp-local-2-device `script.py`),
- every recover into a live target (`utils/recovery/base.py`, used by the
  volume, NFS and device recover scripts),
- the `recover full` and `recover remote` tree pulls.

A disaster recovery through the documented chain therefore restored
OpenCloud without `user.oc.*`, silently: the copies succeeded and the
dirval stamp does not cover attributes.

All of these now run `rsync -aHAX` (`-aHAXP` for the device sync). A
target filesystem without xattr support makes rsync exit non-zero as soon
as a source file carries attributes, so the hop fails loudly instead of
dropping them; there is no per-device opt-out. The single-image pull in
`recover remote` keeps `-a`. The provider's ssh-wrapper needs no change:
its glob accepts any server flags and its character guard allows them.

Two tests write a `user.oc.id` attribute and assert it survives the NFS
snapshot and the recover; with the old `-a` both fail with
`OSError: [Errno 61] No data available`.

Closes #1021

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-20 18:20:46 +02:00

159 lines
5.9 KiB
Python

"""'full' recovery: recover every backup-stored type against a target host.
Resolves a source to a local backup-root, then discovers the newest
generation of each repo present under it and recovers each type in order
(nfs -> volume -> secrets) against the target via the per-type Recoverers.
The source is one of:
- a local backup-root directory (used directly),
- a remote ``[user@]host[:/path]`` (its backup tree is rsync-pulled first),
- a LUKS device / image (recovered first via the device step, which
restores the tree to its restore-root, then discovered under that root).
"""
from __future__ import annotations
import shlex
import subprocess
import sys
from pathlib import Path
from cli.administration.recover import paths, recoverers, remote
from utils.recovery import manifest
_REPOS: tuple[tuple[str, str], ...] = (
("nfs", "backup-nfs-to-local"),
("volume", "backup-docker-to-local"),
("secrets", "backup-secrets-to-local"),
)
PULL_STAGE = "/tmp/infinito-recover-pull" # noqa: S108 - operator recovery staging dir
def _newest_gen(root: Path, repo: str) -> Path | None:
"""Newest ``<root>/<machine-hash>/<repo>/<generation>`` directory, if any."""
generations = sorted(root.glob(f"*/{repo}/*"))
return generations[-1] if generations else None
def plan(root: Path) -> tuple[list[tuple[str, str]], list[str]]:
"""(type, source) for each present repo, in order; volume per-volume.
The volume repo contributes a database step after its file steps: the
dumps have to land once the volumes are back and while the consumers are
still down, which is where the caller has them.
Returns:
The steps, and the repos whose manifest could not be read. A repo that
cannot state its layout is skipped rather than guessed at, but it must
not take the others with it: recovering two repos of three beats
recovering none because one manifest is corrupt.
"""
steps: list[tuple[str, str]] = []
unreadable: list[str] = []
for rtype, repo in _REPOS:
generation = _newest_gen(root, repo)
if generation is None:
continue
try:
names = manifest.layout_of(generation)
except ValueError as error:
unreadable.append(f"{repo}: {error}")
continue
files_glob, dump_glob = manifest.globs_of(names)
files_dir = names["files_dir"]
if rtype == "volume":
steps += [(rtype, str(vol)) for vol in sorted(generation.glob(files_glob))]
if any(generation.glob(dump_glob)):
steps.append(("database", str(generation)))
elif (generation / files_dir).is_dir():
steps.append((rtype, str(generation / files_dir)))
return steps, unreadable
def _pull_cmd(source: str) -> list[str]:
remote = source if ":" in source else f"{source}:{paths.BACKUP_ROOT}"
return ["rsync", "-aHAX", f"{remote}/", f"{PULL_STAGE}/"]
def _is_device(source: str) -> bool:
"""A local source whose leading segment is a block device or an image file."""
leading = Path(source.split(":", 1)[0])
return leading.is_block_device() or leading.is_file()
def _device_restore_root(source: str) -> str:
"""The device source's restore-root (its absolute colon segment, else the default)."""
for segment in source.split(":")[1:]:
if segment.startswith("/"):
return segment
return paths.BACKUP_ROOT
def _recover_under(
root: Path, target: str, *, preview: bool, service_backup: bool
) -> int:
steps, unreadable = plan(root)
for problem in unreadable:
print(f"# full: SKIPPED {problem}", file=sys.stderr)
if not steps:
print(f"# full: no backup repos found under {root}")
return 1
returncode = 2 if unreadable else 0
for rtype, files_dir in steps:
cmd = recoverers.RECOVERERS[rtype].command(
files_dir, service_backup=service_backup, target=target
)
print(f"# full {rtype} {target}: {shlex.join(cmd)}")
if not preview:
failed = subprocess.run(cmd, check=False).returncode
if failed != 0:
return failed
return returncode
def run(source: str, target: str, *, preview: bool, service_backup: bool) -> int:
if source.startswith("/") and _is_device(source):
device_cmd = recoverers.RECOVERERS["device"].command(
source,
service_backup=service_backup,
passphrase_stdin=not sys.stdin.isatty(),
target=target,
)
print(f"# full device {target}: {shlex.join(device_cmd)}")
if preview:
print(
" # then discover + recover nfs -> volume -> secrets under the restored root"
)
return 0
if subprocess.run(device_cmd, check=False).returncode != 0:
return 2
root = Path(_device_restore_root(source))
elif source.startswith("/"):
root = Path(source)
elif remote.split_host(source)[1].split(":", 1)[0].startswith("/dev/"):
returncode, root_str = remote.run(
source,
preview=preview,
service_backup=service_backup,
passphrase_stdin=not sys.stdin.isatty(),
)
if preview:
print(
" # then discover + recover nfs -> volume -> secrets under the pulled root"
)
return 0
if returncode != 0:
return returncode
root = Path(root_str)
else:
pull = _pull_cmd(source)
print(f"# full: pull remote backup tree\n {shlex.join(pull)}")
if preview:
print(" # then discover + recover nfs -> volume -> secrets")
return 0
subprocess.run(["mkdir", "-p", PULL_STAGE], check=False)
if subprocess.run(pull, check=False).returncode != 0:
return 2
root = Path(PULL_STAGE)
return _recover_under(root, target, preview=preview, service_backup=service_backup)