Skip to content

nasbackup: improve error reporting during backup #13426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
shwstppr wants to merge 1 commit into
base: 4.22
Choose a base branch
from
+24 −5
Draft

nasbackup: improve error reporting during backup #13426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions scripts/vm/hypervisor/kvm/nasbackup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,31 @@ backup_running_vm() {
rm -f $dest/backup.xml
sync

# Print statistics
virsh -c qemu:///system domjobinfo $VM --completed
du -sb $dest | cut -f1
# Collect statistics now, print them after successful unmount/rmdir.
local job_info
local backup_size
if ! job_info=$(virsh -c qemu:///system domjobinfo "$VM" --completed 2>&1); then
echo "Failed to get backup job info for $VM: $job_info"
exit 1
elif ! backup_size=$(du -sb "$dest" 2>&1); then
echo "Failed to get backup size for $dest: $backup_size"
exit 1
fi

umount $mount_point
rmdir $mount_point
local unmount_err
if ! unmount_err=$(umount "$mount_point" 2>&1); then
echo "Failed to unmount $mount_point: $unmount_err"
exit 1
fi

local rmdir_err
if ! rmdir_err=$(rmdir "$mount_point" 2>&1); then
echo "Failed to remove mount point $mount_point: $rmdir_err"
exit 1
fi

echo "$job_info"
echo "$backup_size" | cut -f1
}

backup_stopped_vm() {
Expand Down
Loading