StakeSquid/ethereum-rpc-docker
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

slowdisk offload: fix EXDEV - extract statics via tar --transform, not through symlinks

Browse Source 
tar cannot create files through a directory symlink whose target is on
another device: open() fails with 'Invalid cross-device link' even under
--keep-directory-symlink (reproduced, GNU tar 1.34 and 1.35). This killed
the katana->uk-4 provision (place-provision-katana-EU-NorthWest-p1) and
means the slowdisk EXTRACT path never worked on hosts with a separate
/slowdisk device. Rewrite member paths with --transform so tar writes
directly into /slowdisk/rpc_<key>__data_<rel>; the symlink stays for the
container's runtime view. Also aligns restore-volumes' nested-path target
naming to the double-underscore convention clone-backup already uses.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
rob
2026-07-11 01:50:08 +00:00
parent defb9133ea
commit fccf279262
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clone-backup.sh
View File

@@ -224,6 +224,7 @@ setup_slowdisk_structure() {
return 1 return 1
fi fi
SLOWDISK_TRANSFORMS=""
echo "Setting up SLOWDISK structure for $key" echo "Setting up SLOWDISK structure for $key"
echo " Static size: $((static_size_kb / 1024))MB" echo " Static size: $((static_size_kb / 1024))MB"
echo " Static paths: ${#static_paths[@]}" echo " Static paths: ${#static_paths[@]}"
@@ -253,6 +254,11 @@ setup_slowdisk_structure() {
local slowdisk_path="${slowdisk_base}/rpc_${key}__data_${path//\//__}" local slowdisk_path="${slowdisk_base}/rpc_${key}__data_${path//\//__}"
local target_path="${volume_path}/${path}" local target_path="${volume_path}/${path}"
local target_dir=$(dirname "$target_path") local target_dir=$(dirname "$target_path")
# tar cannot extract THROUGH a symlink to another device (EXDEV
# "Invalid cross-device link", reproduced GNU tar 1.34+1.35 2026-07-11 -
# killed the katana->uk-4 provision). Collect --transform rewrites so tar
# writes directly into /slowdisk; the symlink remains for runtime.
SLOWDISK_TRANSFORMS+=" --transform='s|^\\(\\./\\)\\?var/lib/docker/volumes/rpc_${key}/_data/${path}|slowdisk/rpc_${key}__data_${path//\//__}|'"
# Create parent directories in volume # Create parent directories in volume
$SSH_CMD "$DEST_HOST" "mkdir -p '$target_dir'" $SSH_CMD "$DEST_HOST" "mkdir -p '$target_dir'"
@@ -327,7 +333,7 @@ transfer_backup() {
# Use --skip-old-files to avoid overwriting existing symlinks/directories # Use --skip-old-files to avoid overwriting existing symlinks/directories
# and --keep-directory-symlink so tar extracts THROUGH the pre-created dir symlinks # and --keep-directory-symlink so tar extracts THROUGH the pre-created dir symlinks
# instead of trying to mkdir over them (which fails with 'Cannot mkdir: File exists') # instead of trying to mkdir over them (which fails with 'Cannot mkdir: File exists')
tar_extract_opts="-xf - -C / --skip-old-files --keep-directory-symlink" tar_extract_opts="-xf - -C / --skip-old-files --keep-directory-symlink${SLOWDISK_TRANSFORMS}"
echo "SLOWDISK structure ready, will extract respecting symlinks" echo "SLOWDISK structure ready, will extract respecting symlinks"
else else
echo "Warning: Failed to setup SLOWDISK structure, falling back to normal extraction" echo "Warning: Failed to setup SLOWDISK structure, falling back to normal extraction"
@@ -513,7 +519,7 @@ transfer_backup_ssh() {
if setup_slowdisk_structure "$key" "$static_size_kb" "${static_paths[@]}"; then if setup_slowdisk_structure "$key" "$static_size_kb" "${static_paths[@]}"; then
# and --keep-directory-symlink so tar extracts THROUGH the pre-created dir symlinks # and --keep-directory-symlink so tar extracts THROUGH the pre-created dir symlinks
# instead of trying to mkdir over them (which fails with 'Cannot mkdir: File exists') # instead of trying to mkdir over them (which fails with 'Cannot mkdir: File exists')
tar_extract_opts="-xf - -C / --skip-old-files --keep-directory-symlink" tar_extract_opts="-xf - -C / --skip-old-files --keep-directory-symlink${SLOWDISK_TRANSFORMS}"
echo "SLOWDISK structure ready, will extract respecting symlinks" echo "SLOWDISK structure ready, will extract respecting symlinks"
else else
echo "Warning: Failed to setup SLOWDISK structure, falling back to normal extraction" echo "Warning: Failed to setup SLOWDISK structure, falling back to normal extraction"

16
restore-volumes.sh
View File

@@ -137,10 +137,17 @@ prep_static_offload() {
[ -z "$rel" ] && continue [ -z "$rel" ] && continue
rel="${rel#/}" rel="${rel#/}"
case "$rel" in *..*) echo " skip unsafe static path '$rel'"; continue;; esac case "$rel" in *..*) echo " skip unsafe static path '$rel'"; continue;; esac
target="/slowdisk/rpc_${key}__data_${rel//\//_}" target="/slowdisk/rpc_${key}__data_${rel//\//__}"
echo " offload static '$rel' -> $target" echo " offload static '$rel' -> $target"
mkdir -p "$target" "$data_dir/$(dirname "$rel")" || { echo " WARN: mkdir failed for '$rel', skipping"; continue; } mkdir -p "$target" "$data_dir/$(dirname "$rel")" || { echo " WARN: mkdir failed for '$rel', skipping"; continue; }
ln -sfn "$target" "$data_dir/$rel" ln -sfn "$target" "$data_dir/$rel"
# tar CANNOT extract through a symlink whose target is on another device -
# open() fails with EXDEV "Invalid cross-device link" even with
# --keep-directory-symlink (reproduced GNU tar 1.34 + 1.35, 2026-07-11;
# killed the katana->uk-4 provision). Rewrite the member paths so tar
# writes DIRECTLY into the /slowdisk target; the symlink stays for the
# container's runtime view.
static_transform_args+=(--transform "s|^\\(\\./\\)\\?var/lib/docker/volumes/rpc_${key}/_data/${rel}|slowdisk/rpc_${key}__data_${rel//\//__}|")
done < <(awk 'NR>3 && NF>=2 {print $NF}' "$meta") done < <(awk 'NR>3 && NF>=2 {print $NF}' "$meta")
} }
@@ -167,6 +174,7 @@ while IFS= read -r key; do
meta_file="${newest_file%.tar.zst}.txt" meta_file="${newest_file%.tar.zst}.txt"
echo "=== restoring rpc_$key <- $newest_file ===" echo "=== restoring rpc_$key <- $newest_file ==="
static_offload_used=0 static_offload_used=0
static_transform_args=()
# 1) wipe live data AND any /slowdisk static targets for this key (no leak on re-restore) # 1) wipe live data AND any /slowdisk static targets for this key (no leak on re-restore)
delete_slowdisk_targets_for_key "$key" delete_slowdisk_targets_for_key "$key"
@@ -193,7 +201,7 @@ while IFS= read -r key; do
if [[ -n "$remote_source" ]]; then if [[ -n "$remote_source" ]]; then
if [ ! -d "$backup_dir" ]; then if [ ! -d "$backup_dir" ]; then
echo "No /backup cache: streaming + extracting $newest_file directly" echo "No /backup cache: streaming + extracting $newest_file directly"
curl --ipv4 -# "${remote_source}${newest_file}" | zstd -d | tar -xf - --keep-directory-symlink -C / curl --ipv4 -# "${remote_source}${newest_file}" | zstd -d | tar -xf - --keep-directory-symlink "${static_transform_args[@]}" -C /
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error processing $newest_file" >&2 echo "Error processing $newest_file" >&2
exit 1 exit 1
@@ -203,14 +211,14 @@ while IFS= read -r key; do
if [ ! -e "$backup_file" ] || [ -e "${backup_file}.aria2" ]; then if [ ! -e "$backup_file" ] || [ -e "${backup_file}.aria2" ]; then
aria2c -c -Z -x8 -j8 -s8 -d "$backup_dir" "${remote_source}${newest_file}" aria2c -c -Z -x8 -j8 -s8 -d "$backup_dir" "${remote_source}${newest_file}"
fi fi
tar -I zstd -xf "$backup_file" --keep-directory-symlink -C / tar -I zstd -xf "$backup_file" --keep-directory-symlink "${static_transform_args[@]}" -C /
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error processing $newest_file" >&2 echo "Error processing $newest_file" >&2
exit 1 exit 1
fi fi
fi fi
else else
tar -I zstd -xf "$newest_file" --keep-directory-symlink -C / tar -I zstd -xf "$newest_file" --keep-directory-symlink "${static_transform_args[@]}" -C /
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error processing $newest_file" >&2 echo "Error processing $newest_file" >&2
exit 1 exit 1