From 19599cd903648689644a7ce861df3362501600c4 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 16 Jan 2013 13:21:27 +0100 Subject: [PATCH] cancel backup before stopping the vm bump version ro 2.3-6 --- Makefile | 2 +- PVE/VZDump/QemuServer.pm | 11 +++++++---- changelog.Debian | 6 ++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 975f0b03..df341834 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=2.3 VERSION=2.3 PACKAGE=qemu-server -PKGREL=5 +PKGREL=6 DESTDIR= PREFIX=/usr diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index 0e902bd9..ad85cc29 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -414,13 +414,19 @@ sub archive { }; my $err = $@; + if ($err) { + $self->loginfo("aborting backup job"); + eval { PVE::QemuServer::vm_mon_cmd($vmid, 'backup_cancel'); }; + warn $@ if $@; + } + if ($stop_after_backup) { # stop if not running eval { my $resp = PVE::QemuServer::vm_mon_cmd($vmid, 'query-status'); my $status = $resp && $resp->{status} ? $resp->{status} : 'unknown'; if ($status eq 'prelaunch') { - $self->loginfo("stoping kvm after backup task"); + $self->loginfo("stopping kvm after backup task"); PVE::QemuServer::vm_stop($self->{storecfg}, $vmid, $skiplock); } else { $self->loginfo("kvm status changed after backup ('$status')" . @@ -430,9 +436,6 @@ sub archive { } if ($err) { - $self->loginfo("aborting backup job"); - eval { PVE::QemuServer::vm_mon_cmd($vmid, 'backup_cancel'); }; - warn $@ if $@; if ($cpid) { kill(-9, $cpid); waitpid($cpid, 0); diff --git a/changelog.Debian b/changelog.Debian index c1531e21..9a8d99cb 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,9 @@ +qemu-server (2.3-6) unstable; urgency=low + + * fix bug #315: cancel backup before stopping the VM + + -- Proxmox Support Team Wed, 16 Jan 2013 13:22:58 +0100 + qemu-server (2.3-5) unstable; urgency=low * fix bug #307: correctly restore disk settings -- 2.39.5