From ae9cb0c7f502f104391dfe753b5252edd8881093 Mon Sep 17 00:00:00 2001
From: Benjamin Herbert <2254565+BenjaminHerbert@users.noreply.github.com>
Date: Wed, 16 Jul 2025 23:43:08 +0200
Subject: [PATCH] fix(backup): Add error handling and logging backup and
 restore scripts (#1120)

Co-authored-by: Luigi Operoso <40476330+brokenpip3@users.noreply.github.com>
---
 backup/pvc/VERSION.txt    |  2 +-
 backup/pvc/bin/backup.sh  |  4 ++++
 backup/pvc/bin/restore.sh | 12 +++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/backup/pvc/VERSION.txt b/backup/pvc/VERSION.txt
index 0eec13e4..f87d474c 100644
--- a/backup/pvc/VERSION.txt
+++ b/backup/pvc/VERSION.txt
@@ -1 +1 @@
-v0.4.2
+v0.4.3
diff --git a/backup/pvc/bin/backup.sh b/backup/pvc/bin/backup.sh
index 13d2f096..40c9f8dd 100755
--- a/backup/pvc/bin/backup.sh
+++ b/backup/pvc/bin/backup.sh
@@ -51,6 +51,10 @@ if [[ "$ret" -eq 0 ]]; then
   _log "INFO" "[backup] backup ${BACKUP_NUMBER} was completed without warnings"
 elif [[ "$ret" -eq 1 ]]; then
   _log "INFO" "[backup] backup ${BACKUP_NUMBER} was completed with some warnings"
+else
+  _log "ERROR" "[backup] backup ${BACKUP_NUMBER} failed with error code: $ret"
+  _clean
+  exit "$ret"
 fi
 
 mv "${BACKUP_TMP_DIR}/${BACKUP_NUMBER}.tar.zstd" "${BACKUP_DIR}/${BACKUP_NUMBER}.tar.zstd"
diff --git a/backup/pvc/bin/restore.sh b/backup/pvc/bin/restore.sh
index 3a692625..f10e2e75 100755
--- a/backup/pvc/bin/restore.sh
+++ b/backup/pvc/bin/restore.sh
@@ -39,7 +39,17 @@ else
   exit 1
 fi
 
-tar $OPTS -C "${JENKINS_HOME}" -xf "${BACKUP_DIR}/${BACKUP_NUMBER}.${EXT}"
+tar $OPTS -C "${JENKINS_HOME}" -xf "${BACKUP_DIR}/${BACKUP_NUMBER}.${EXT}" || ret=$?
+
+if [[ "$ret" -eq 0 ]]; then
+  _log "INFO" "[restore] restore ${BACKUP_NUMBER} was completed without warnings"
+elif [[ "$ret" -eq 1 ]]; then
+  _log "INFO" "[restore] restore ${BACKUP_NUMBER} was completed with some warnings"
+else
+  _log "ERROR" "[restore] restore ${BACKUP_NUMBER} failed with error code: $ret"
+  exit "$ret"
+fi
+
 
 _log "INFO" "[restore] deleting lock file ${TRAP_FILE}"
 test -f "${TRAP_FILE}" && rm -f "${TRAP_FILE}"