proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-04 05:39:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api create: cleanup the new config log on error

Browse Source 
Otherwise cases like trying to restore a protected VM would
leave a lock in the config.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2018-06-12 10:50:41 +02:00 committed by Thomas Lamprecht
parent e33f774d00
commit 5bf9618308
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
PVE/API2/Qemu.pm
View File

@ -564,7 +564,10 @@ __PACKAGE__->register_method({
PVE::AccessControl::add_vm_to_pool($vmid, $pool) if $pool; PVE::AccessControl::add_vm_to_pool($vmid, $pool) if $pool;
PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node }) if $start_after_create; if ($start_after_create) {
eval { PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node }) };
warn $@ if $@;
}
}; };
# ensure no old replication state are exists # ensure no old replication state are exists
@ -617,12 +620,37 @@ __PACKAGE__->register_method({
if ($start_after_create) { if ($start_after_create) {
print "Execute autostart\n"; print "Execute autostart\n";
PVE::API2::Qemu->vm_start({vmid => $vmid, node => $node}); eval { PVE::API2::Qemu->vm_start({vmid => $vmid, node => $node}) };
warn $@ if $@;
} }
}; };
my $worker_name = $is_restore ? 'qmrestore' : 'qmcreate'; my ($code, $worker_name);
my $code = $is_restore ? $restorefn : $createfn; if ($is_restore) {
$worker_name = 'qmrestore';
$code = sub {
eval { $restorefn->() };
if (my $err = $@) {
eval { PVE::QemuConfig->remove_lock($vmid, 'create') };
warn $@ if $@;
die $err;
}
};
} else {
$worker_name = 'qmcreate';
$code = sub {
eval { $createfn->() };
if (my $err = $@) {
eval {
my $conffile = PVE::QemuConfig->config_file($vmid);
unlink($conffile)
or die "failed to remove config file: $@\n";
};
warn $@ if $@;
die $err;
}
};
}
return $rpcenv->fork_worker($worker_name, $vmid, $authuser, $code); return $rpcenv->fork_worker($worker_name, $vmid, $authuser, $code);
}}); }});