Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2024-12-25 23:21:43 +03:00
Code Releases Activity

vzdump: improve error reporting

Browse Source 
And use kill(9) instead of kill(-9), which simply hangs
This commit is contained in:
Dietmar Maurer 2013-02-28 10:47:55 +01:00
parent 64b05128e8
commit 60635a5733
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/VZDump/QemuServer.pm
View File

@ -348,7 +348,7 @@ sub archive {
die "fork compressor '$comp' failed\n";
};
if (my $err = $@) {
warn $err;
$self->logerr($err);
POSIX::_exit(1);
}
POSIX::_exit(0);
@ -453,9 +453,12 @@ sub archive {
my $err = $@;
if ($err) {
$self->logerr($err);
$self->loginfo("aborting backup job");
eval { PVE::QemuServer::vm_mon_cmd($vmid, 'backup-cancel'); };
warn $@ if $@;
if (my $err1 = $@) {
$self->logerr($err1);
}
}
if ($stop_after_backup) {
@ -475,7 +478,7 @@ sub archive {
if ($err) {
if ($cpid) {
kill(-9, $cpid);
kill(9, $cpid);
waitpid($cpid, 0);
}
die $err;

2
changelog.Debian
View File

@ -5,6 +5,8 @@ qemu-server (2.3-14) unstable; urgency=low
* Migrate: fix check if a backing file exist
* vncproxy: wait max 10s for the socket if it does not exist
* vzdump: improve error reporting
-- Proxmox Support Team <support@proxmox.com> Thu, 28 Feb 2013 06:21:30 +0100