Skip to content

Commit f9a9451

Browse files
authored
[NAS Backup] Suppress Errors in Disk Usage Calculation that Caused Backup to Fail (#13424)
1 parent 89b2b03 commit f9a9451

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

scripts/vm/hypervisor/kvm/nasbackup.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BACKUP_DIR=""
3434
DISK_PATHS=""
3535
QUIESCE=""
3636
logFile="/var/log/cloudstack/agent/agent.log"
37-
37+
UNMOUNT_TIMEOUT=60
3838
EXIT_CLEANUP_FAILED=20
3939

4040
log() {
@@ -197,10 +197,10 @@ backup_running_vm() {
197197

198198
# Print statistics
199199
virsh -c qemu:///system domjobinfo $VM --completed
200-
du -sb $dest | cut -f1
201-
202-
umount $mount_point
203-
rmdir $mount_point
200+
backup_size=$(du -sb "$dest" 2>>"$logFile" | cut -f1) || { log -ne "WARNING: du failed for $dest, reporting size as 0"; backup_size=0; }
201+
timeout "$UNMOUNT_TIMEOUT" umount "$mount_point" 2>>"$logFile" || { log "WARNING: umount of $mount_point failed or timed out"; true; }
202+
rmdir "$mount_point" 2>>"$logFile" || { log "WARNING: rmdir of $mount_point failed"; true; }
203+
echo "$backup_size"
204204
}
205205

206206
backup_stopped_vm() {

0 commit comments

Comments
 (0)