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 A698E94620 for ; Wed, 10 Apr 2024 15:14:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F0E091054B for ; Wed, 10 Apr 2024 15:13:32 +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:32 +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 5FD1C43B1D for ; Wed, 10 Apr 2024 15:13:32 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 15:13:11 +0200 Message-Id: <20240410131316.1208679-15-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 qemu-server 1/6] config: add pool usage helper 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:14:03 -0000 determining the usage values for the current config. pending values are taken into account if they are higher than the current value only, else it would be possible to easily circumvent config limits by setting non-hotpluggable pending values. Signed-off-by: Fabian Grünbichler --- PVE/QemuConfig.pm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm index ca30eda0..550ec941 100644 --- a/PVE/QemuConfig.pm +++ b/PVE/QemuConfig.pm @@ -572,4 +572,34 @@ sub has_cloudinit { return $found; } +# for determining pool usage vs limits +# +# this gives the higher of pending or currently configured +sub get_pool_usage { + my ($class, $conf) = @_; + + my $usage = {}; + + my $get_max = sub { + my $max = 0; + + for my $curr (@_) { + $max = $curr if defined($curr) && $curr > $max; + } + + return $max; + }; + + $usage->{sockets} = $get_max->(($conf->{pending}->{sockets}, $conf->{sockets}, 1)); + $usage->{cores} = $get_max->(($conf->{pending}->{cores}, $conf->{cores}, 1)); + $usage->{cpu} = $usage->{sockets} * $usage->{cores}; + $usage->{mem} = $get_max->(( + get_current_memory($conf->{pending}->{memory}), + get_current_memory($conf->{memory}) + )); + $usage->{mem} *= 1024*1024; + + return $usage; +} + 1; -- 2.39.2