proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-14 15:54:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

partially fix #3056: try to cancel backup without uuid

Browse Source 
if the 'backup' qmp call itself times out or fails, we still want to
try to cancel the backup, else it can happen that there is still
a backup running even when vzdump thinks it was canceled

qapi docs says that backup cancel always returns success, even
if no backup is running

since we hold a global and a per vm lock for the backup, this should be
ok, since we should not reach this code without that lock

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-10-19 16:11:38 +02:00 committed by Thomas Lamprecht
parent acc10e5159
commit edae17185b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/VZDump/QemuServer.pm
View File

@ -577,7 +577,7 @@ sub archive_pbs {
my $err = $@;
if ($err) {
$self->logerr($err);
$self->mon_backup_cancel($vmid) if defined($backup_job_uuid);
$self->mon_backup_cancel($vmid);
}
$self->restore_vm_power_state($vmid);
@ -754,7 +754,7 @@ sub archive_vma {
my $err = $@;
if ($err) {
$self->logerr($err);
$self->mon_backup_cancel($vmid) if defined($backup_job_uuid);
$self->mon_backup_cancel($vmid);
}
$self->restore_vm_power_state($vmid);