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

API/create: move locking inside worker

Browse Source 
Move the locking inside worker, so that the process doing the actual
work (create or restore) holds the lock, and can call functions which
do locking without deadlocking.

This mirrors the behaviour we use for containers, and allows to add
an 'autostart' parameter which starts the VM after successful
creation. vm_start needs the lock and as not the worker but it's
parents held it, it couldn't know that it was actually save to
continue...

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2018-06-01 16:37:39 +02:00 committed by Wolfgang Bumiller
parent b8ff6fb2a6
commit 8ba8418ca1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/API2/Qemu.pm
View File

@ -462,6 +462,7 @@ __PACKAGE__->register_method({
my $vmid = extract_param($param, 'vmid');
my $archive = extract_param($param, 'archive');
my $is_restore = !!$archive;
my $storage = extract_param($param, 'storage');
@ -569,7 +570,7 @@ __PACKAGE__->register_method({
# ensure no old replication state are exists
PVE::ReplicationState::delete_guest_states($vmid);
return $rpcenv->fork_worker('qmrestore', $vmid, $authuser, $realcmd);
return PVE::QemuConfig->lock_config_full($vmid, 1, $realcmd);
};
my $createfn = sub {
@ -616,10 +617,13 @@ __PACKAGE__->register_method({
PVE::AccessControl::add_vm_to_pool($vmid, $pool) if $pool;
};
return $rpcenv->fork_worker('qmcreate', $vmid, $authuser, $realcmd);
return PVE::QemuConfig->lock_config_full($vmid, 1, $realcmd);
};
return PVE::QemuConfig->lock_config_full($vmid, 1, $archive ? $restorefn : $createfn);
my $worker_name = $is_restore ? 'qmrestore' : 'qmcreate';
my $code = $is_restore ? $restorefn : $createfn;
return $rpcenv->fork_worker($worker_name, $vmid, $authuser, $code);
}});
__PACKAGE__->register_method({