[pve-devel] [PATCH qemu-server] partially fix #3056: try to cancel backup without uuid

[pve-devel] [PATCH qemu-server] partially fix #3056: try to cancel backup without uuid

[Dominik Csapak]

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>
---
 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 c8094bd..8792e76 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);
-- 
2.20.1

[pve-devel] applied: [PATCH qemu-server] partially fix #3056: try to cancel backup without uuid

[Thomas Lamprecht]

On 19.10.20 16:11, Dominik Csapak wrote:
> 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>
> ---
>  PVE/VZDump/QemuServer.pm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
>

applied, thanks!