rene/nchsdhg-agathe-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Harden CIFS mount detection and remount retry

Browse Source
This commit is contained in:
René Mathieu
2026-03-13 07:51:31 +01:00
parent e939ceec7a
commit 4a4d84e5dd
1 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
scripts/agathe_backup.sh
View File

@@ -139,7 +139,7 @@ cleanup() {
set +e set +e
log "== Cleanup ==" log "== Cleanup =="
if mountpoint -q "$CIFS_MOUNTPOINT"; then if is_cifs_mounted; then
log "Unmount: $CIFS_MOUNTPOINT" log "Unmount: $CIFS_MOUNTPOINT"
umount "$CIFS_MOUNTPOINT" 2>/dev/null || umount -l "$CIFS_MOUNTPOINT" || true umount "$CIFS_MOUNTPOINT" 2>/dev/null || umount -l "$CIFS_MOUNTPOINT" || true
else else
@@ -218,10 +218,14 @@ _mount_cifs_with_opts() {
fi fi
} }
is_cifs_mounted() {
awk -v mp="$CIFS_MOUNTPOINT" '$2 == mp && $3 == "cifs" { found=1 } END { exit(found ? 0 : 1) }' /proc/mounts
}
mount_cifs() { mount_cifs() {
log "== CIFS mount: $CIFS_SHARE -> $CIFS_MOUNTPOINT ==" log "== CIFS mount: $CIFS_SHARE -> $CIFS_MOUNTPOINT =="
if mountpoint -q "$CIFS_MOUNTPOINT"; then if is_cifs_mounted; then
log "Mountpoint ist gemountet -> versuche umount" log "Mountpoint ist gemountet -> versuche umount"
umount "$CIFS_MOUNTPOINT" 2>/dev/null || umount -l "$CIFS_MOUNTPOINT" || true umount "$CIFS_MOUNTPOINT" 2>/dev/null || umount -l "$CIFS_MOUNTPOINT" || true
fi fi
@@ -241,34 +245,49 @@ mount_cifs() {
_mount_cifs_with_opts "$opts_robust" _mount_cifs_with_opts "$opts_robust"
local rc=$? local rc=$?
set -e set -e
if [[ $rc -eq 0 ]]; then if [[ $rc -eq 0 ]] && is_cifs_mounted; then
log "OK gemountet (robust)." log "OK gemountet (robust)."
return 0 return 0
fi fi
if [[ $rc -eq 0 ]]; then
log "WARNUNG: mount meldet Erfolg, aber CIFS ist nicht stabil eingehängt."
fi
log "WARNUNG: CIFS mount (robust) fehlgeschlagen (rc=$rc). Fallback auf Basis-Optionen." log "WARNUNG: CIFS mount (robust) fehlgeschlagen (rc=$rc). Fallback auf Basis-Optionen."
set +e set +e
_mount_cifs_with_opts "$opts_base" _mount_cifs_with_opts "$opts_base"
rc=$? rc=$?
set -e set -e
if [[ $rc -eq 0 ]]; then if [[ $rc -eq 0 ]] && is_cifs_mounted; then
log "OK gemountet (base)." log "OK gemountet (base)."
return 0 return 0
fi fi
if [[ $rc -eq 0 ]]; then
log "WARNUNG: mount (base) meldet Erfolg, aber CIFS ist nicht stabil eingehängt."
fi
log "FEHLER: CIFS mount fehlgeschlagen (rc=$rc)." log "FEHLER: CIFS mount fehlgeschlagen (rc=$rc)."
exit 1 exit 1
} }
ensure_cifs() { ensure_cifs() {
if ! mountpoint -q "$CIFS_MOUNTPOINT"; then local attempt
log "WARNUNG: CIFS nicht gemountet -> remount" for ((attempt=1; attempt<=3; attempt++)); do
if is_cifs_mounted; then
return 0
fi
log "WARNUNG: CIFS nicht gemountet -> remount (Versuch ${attempt}/3)"
mount_cifs mount_cifs
fi sleep 1
if ! mountpoint -q "$CIFS_MOUNTPOINT"; then
log "FEHLER: CIFS Remount fehlgeschlagen." if is_cifs_mounted; then
exit 1 return 0
fi fi
done
log "FEHLER: CIFS Remount fehlgeschlagen."
exit 1
} }
run_rsync_with_cifs_retry() { run_rsync_with_cifs_retry() {
@@ -292,7 +311,7 @@ run_rsync_with_cifs_retry() {
if [[ "$rc" -eq 11 || "$rc" -eq 12 || "$rc" -eq 30 || "$rc" -eq 35 ]]; then if [[ "$rc" -eq 11 || "$rc" -eq 12 || "$rc" -eq 30 || "$rc" -eq 35 ]]; then
if [[ "$attempt" -lt "$TOMEDO_RSYNC_MAX_RETRIES" ]]; then if [[ "$attempt" -lt "$TOMEDO_RSYNC_MAX_RETRIES" ]]; then
log "WARNUNG: rsync ${label} fehlgeschlagen (rc=$rc). Remount und Retry in ${TOMEDO_RSYNC_RETRY_SLEEP}s." log "WARNUNG: rsync ${label} fehlgeschlagen (rc=$rc). Remount und Retry in ${TOMEDO_RSYNC_RETRY_SLEEP}s."
if mountpoint -q "$CIFS_MOUNTPOINT"; then if is_cifs_mounted; then
umount "$CIFS_MOUNTPOINT" 2>/dev/null || umount -l "$CIFS_MOUNTPOINT" || true umount "$CIFS_MOUNTPOINT" 2>/dev/null || umount -l "$CIFS_MOUNTPOINT" || true
fi fi
sleep "$TOMEDO_RSYNC_RETRY_SLEEP" sleep "$TOMEDO_RSYNC_RETRY_SLEEP"