cancel backup before stopping the vm

bump version ro 2.3-6

diff --git a/Makefile b/Makefile
index 975f0b03c6eb55b34a9ec46f255e5648f27c6588..df3418342dd3973172ae91b160bc55d0423cde63 100644 (file)
--- 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 0e902bd9b2f2ada61503bb43b31a00c73c3758a0..ad85cc29b001f7188e9f8394b7774c645e13041b 100644 (file)
--- 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 c1531e21f399a6cb19d09acaa896ed57c693236c..9a8d99cb67610fa71387a5b5b9a245eb73d3ed3d 100644 (file)
--- 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 <support@proxmox.com>  Wed, 16 Jan 2013 13:22:58 +0100
+
 qemu-server (2.3-5) unstable; urgency=low
 
   * fix bug #307: correctly restore disk settings