early if possible, to avoid big cleanups cause of limit exhaustion. Signed-off-by: Fabian Grünbichler <f.gruenbich...@proxmox.com> --- src/PVE/API2/LXC.pm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index fd42ccf..80bac3d 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -4,6 +4,7 @@ use strict; use warnings; use IO::Socket::UNIX; +use Storable qw(dclone); use Socket qw(SOCK_STREAM); use PVE::SafeSyslog; @@ -51,6 +52,23 @@ my $check_storage_access_migrate = sub { if !$scfg->{content}->{rootdir}; }; +my $check_pool_limits_create = sub { + my ($vmid, $conf, $running, $pool) = @_; + if ($pool) { + my $usage = PVE::LXC::Config->get_pool_usage($conf); + my $changes = { + cpu => $usage->{cpu}, + mem => $usage->{mem}, + absolute => 1, # in case this is an in-place restore + }; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $changes, $pool); + if ($running) { + $changes->{running} = 1; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $changes, $pool); + } + } +}; + __PACKAGE__->register_method ({ subclass => "PVE::API2::LXC::Config", path => '{vmid}/config', @@ -412,6 +430,12 @@ __PACKAGE__->register_method({ if ($old_conf->{unprivileged} && !$conf->{unprivileged}) { $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Allocate']); } + + my $merged = dclone($conf); + PVE::LXC::Create::sanitize_and_merge_config($merged, $orig_conf, 0, 0); + $check_pool_limits_create->($vmid, $merged, $pool); + } else { + $check_pool_limits_create->($vmid, $conf, $pool); } } if ($storage_only_mode) { @@ -1748,6 +1772,7 @@ __PACKAGE__->register_method({ # Replace the 'disk' lock with a 'create' lock. $newconf->{lock} = 'create'; + $check_pool_limits_create->($newid, $newconf, 0, $pool); # delete all snapshot related config options delete $newconf->@{qw(snapshots parent snaptime snapstate)}; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel