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 C6B0596C12 for ; Tue, 16 Apr 2024 14:21:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7C0F01A5D8 for ; Tue, 16 Apr 2024 14:21:05 +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:04 +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 5678B450BC for ; Tue, 16 Apr 2024 14:21:04 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 14:20:43 +0200 Message-Id: <20240416122054.733817-9-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 7/7] update: 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:05 -0000 Signed-off-by: Fabian Grünbichler --- Notes: v2: - don't multiply mem+swap, but add them up (thanks Dominik) src/PVE/API2/LXC/Config.pm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/PVE/API2/LXC/Config.pm b/src/PVE/API2/LXC/Config.pm index e6c0980..15fab61 100644 --- a/src/PVE/API2/LXC/Config.pm +++ b/src/PVE/API2/LXC/Config.pm @@ -208,6 +208,27 @@ __PACKAGE__->register_method({ my $running = PVE::LXC::check_running($vmid); + my $usage = PVE::LXC::Config->get_pool_usage($conf); + if (defined($param->{memory}) || defined($param->{swap})) { + my $old = $usage->{mem}; + my $new = $param->{memory} || $usage->{memory}; + $new += ($param->{swap} || $usage->{swap}); + + if ($new > $old) { + my $change = { mem => ($new - $old) * 1024 * 1024 }; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $change); + } + } + if (defined($param->{cores})) { + my $old = $usage->{cpu}; + my $new = $param->{cores}; + + if ($new > $old) { + my $change = { cpu => ($new - $old) }; + PVE::GuestHelpers::check_guest_pool_limit($vmid, $change); + } + } + my $errors = PVE::LXC::Config->update_pct_config($vmid, $conf, $running, $param, \@delete, \@revert); PVE::LXC::Config->write_config($vmid, $conf); $conf = PVE::LXC::Config->load_config($vmid); -- 2.39.2