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

correctly add/remove VMs to pool

Browse Source
This commit is contained in:
Dietmar Maurer 2012-02-03 13:44:12 +01:00
parent ae9ca91d80
commit 502d18a2e7
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
PVE/API2/Qemu.pm
View File

@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use Cwd 'abs_path'; use Cwd 'abs_path';
use PVE::Cluster; use PVE::Cluster qw (cfs_read_file cfs_write_file);;
use PVE::SafeSyslog; use PVE::SafeSyslog;
use PVE::Tools qw(extract_param); use PVE::Tools qw(extract_param);
use PVE::Exception qw(raise raise_param_exc); use PVE::Exception qw(raise raise_param_exc);
@ -325,6 +325,15 @@ __PACKAGE__->register_method({
} }
} }
my $addVMtoPoolFn = sub {
my $usercfg = cfs_read_file("user.cfg");
if (my $data = $usercfg->{pools}->{$pool}) {
$data->{vms}->{$vmid} = 1;
$usercfg->{vms}->{$vmid} = $pool;
cfs_write_file("user.cfg", $usercfg);
}
};
my $restorefn = sub { my $restorefn = sub {
if (-f $filename) { if (-f $filename) {
@ -343,6 +352,8 @@ __PACKAGE__->register_method({
storage => $storage, storage => $storage,
pool => $pool, pool => $pool,
unique => $unique }); unique => $unique });
PVE::AccessControl::lock_user_config($addVMtoPoolFn, "can't add VM to pool") if $pool;
}; };
return $rpcenv->fork_worker('qmrestore', $vmid, $authuser, $realcmd); return $rpcenv->fork_worker('qmrestore', $vmid, $authuser, $realcmd);
@ -390,6 +401,8 @@ __PACKAGE__->register_method({
} }
die "create failed - $err"; die "create failed - $err";
} }
PVE::AccessControl::lock_user_config($addVMtoPoolFn, "can't add VM to pool") if $pool;
}; };
return $rpcenv->fork_worker('qmcreate', $vmid, $authuser, $realcmd); return $rpcenv->fork_worker('qmcreate', $vmid, $authuser, $realcmd);
@ -905,12 +918,24 @@ __PACKAGE__->register_method({
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
my $delVMfromPoolFn = sub {
my $usercfg = cfs_read_file("user.cfg");
my $pool = $usercfg->{vms}->{$vmid};
if (my $data = $usercfg->{pools}->{$pool}) {
delete $data->{vms}->{$vmid};
delete $usercfg->{vms}->{$vmid};
cfs_write_file("user.cfg", $usercfg);
}
};
my $realcmd = sub { my $realcmd = sub {
my $upid = shift; my $upid = shift;
syslog('info', "destroy VM $vmid: $upid\n"); syslog('info', "destroy VM $vmid: $upid\n");
PVE::QemuServer::vm_destroy($storecfg, $vmid, $skiplock); PVE::QemuServer::vm_destroy($storecfg, $vmid, $skiplock);
PVE::AccessControl::lock_user_config($delVMfromPoolFn, "pool cleanup failed");
}; };
return $rpcenv->fork_worker('qmdestroy', $vmid, $authuser, $realcmd); return $rpcenv->fork_worker('qmdestroy', $vmid, $authuser, $realcmd);