From edae17185b11ba8c9e88b10c29eacadbf87d6456 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Mon, 19 Oct 2020 16:11:38 +0200 Subject: [PATCH] partially fix #3056: try to cancel backup without uuid 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 --- PVE/VZDump/QemuServer.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index c8094bde..8792e766 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -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);