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 1BB8796B5E for ; Tue, 16 Apr 2024 14:20:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 03FD91A3DD for ; Tue, 16 Apr 2024 14:20:59 +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:20:58 +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 3C0FB450C4 for ; Tue, 16 Apr 2024 14:20:58 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 14:20:37 +0200 Message-Id: <20240416122054.733817-3-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 1/7] 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: Tue, 16 Apr 2024 12:20:59 -0000 to avoid repeating those calculations all over the place. Signed-off-by: Fabian Grünbichler --- src/PVE/LXC/Config.pm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index 1664a35..a6baccd 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -11,6 +11,7 @@ use PVE::DataCenterConfig; use PVE::GuestHelpers; use PVE::INotify; use PVE::JSONSchema qw(get_standard_option); +use PVE::ProcFSTools; use PVE::Tools; use PVE::LXC; @@ -1886,4 +1887,38 @@ sub foreach_passthrough_device { } } +my $cpuinfo = PVE::ProcFSTools::read_cpuinfo(); + +# 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->{cpu} = $get_max->( + $conf->{pending}->{cores}, + $conf->{cores}, + ); + $usage->{cpu} = $cpuinfo->{cpus} if !$usage->{cpu}; + + my $swap = $get_max->($conf->{pending}->{swap}, $conf->{swap}); + my $mem = $get_max->($conf->{pending}->{memory}, $conf->{memory}, 512); + $usage->{mem} = $mem+$swap; + $usage->{mem} *= 1024*1024; + + return $usage; +} + 1; -- 2.39.2