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 332ED96BE4 for ; Tue, 16 Apr 2024 14:21:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 161BC1A44A for ; Tue, 16 Apr 2024 14:21:03 +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 ; Tue, 16 Apr 2024 14:21:02 +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 4F2C2450C6 for ; Tue, 16 Apr 2024 14:21:02 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 14:20:41 +0200 Message-Id: <20240416122054.733817-7-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240416122054.733817-1-f.gruenbichler@proxmox.com> References: <20240416122054.733817-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.056 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 v2 container 5/7] hotplug: 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: Tue, 16 Apr 2024 12:21:03 -0000 by checking the new values against the running limits. Signed-off-by: Fabian Grünbichler --- src/PVE/LXC/Config.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index a6baccd..248100e 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -1434,6 +1434,13 @@ sub vmconfig_hotplug_pending { foreach my $opt (sort keys %{$conf->{pending}}) { # add/change next if $selection && !$selection->{$opt}; + if ($opt eq 'cores') { + PVE::GuestHelpers::check_guest_pool_limit($vmid, { + running => 1, + absolute => 1, + cpu => $conf->{pending}->{cores}, + }) + } if ($LXC_FASTPLUG_OPTIONS->{$opt}) { $conf->{$opt} = delete $conf->{pending}->{$opt}; } @@ -1447,6 +1454,12 @@ sub vmconfig_hotplug_pending { my $hotplug_memory = sub { my ($new_memory, $new_swap) = @_; + PVE::GuestHelpers::check_guest_pool_limit($vmid, { + running => 1, + absolute => 1, + mem => ($new_memory + $new_swap)*1024*1024, + }); + ($new_memory, my $new_memory_high) = calculate_memory_constraints($new_memory); $new_swap = int($new_swap * 1024 * 1024) if defined($new_swap); $cgroup->change_memory_limit($new_memory, $new_swap, $new_memory_high); -- 2.39.2