From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 12058943F7 for ; Wed, 10 Apr 2024 15:13:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE2591037F for ; Wed, 10 Apr 2024 15:13:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 10 Apr 2024 15:13:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 38E5B43B20 for ; Wed, 10 Apr 2024 15:13:22 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 15:13:01 +0200 Message-Id: <20240410131316.1208679-5-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410131316.1208679-1-f.gruenbichler@proxmox.com> References: <20240410131316.1208679-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.057 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH container 3/7] create/restore/clone: handle pool limits X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Apr 2024 13:13:23 -0000 early if possible, to avoid big cleanups cause of limit exhaustion. Signed-off-by: Fabian Grünbichler --- 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