From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <w.bumiller@proxmox.com>
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 7F18A94B3D
for <pve-devel@lists.proxmox.com>; Thu, 11 Apr 2024 11:28:16 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 5FEA31DCE3
for <pve-devel@lists.proxmox.com>; Thu, 11 Apr 2024 11:28:16 +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 <pve-devel@lists.proxmox.com>; Thu, 11 Apr 2024 11:28:15 +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 9A89F43449
for <pve-devel@lists.proxmox.com>; Thu, 11 Apr 2024 11:28:15 +0200 (CEST)
Date: Thu, 11 Apr 2024 11:28:14 +0200
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Fabian =?utf-8?Q?Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Message-ID: <higoazjtpw6jpafk5o65evbxne45p675l7xlf5rnunhyvp73ia@zjaxhwnprb74>
References: <20240410131316.1208679-1-f.gruenbichler@proxmox.com>
<20240410131316.1208679-4-f.gruenbichler@proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20240410131316.1208679-4-f.gruenbichler@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.086 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: Re: [pve-devel] [PATCH container 2/7] status: add pool usage fields
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 11 Apr 2024 09:28:16 -0000
On Wed, Apr 10, 2024 at 03:13:00PM +0200, Fabian Grünbichler wrote:
> these are similar to existing ones, but with slightly different semantics.
>
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
> src/PVE/LXC.pm | 29 +++++++++++++++++++++++++++++
> 1 file changed, 29 insertions(+)
>
> diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
> index 88a9d6f..78c0e18 100644
> --- a/src/PVE/LXC.pm
> +++ b/src/PVE/LXC.pm
> @@ -138,6 +138,18 @@ our $vmstatus_return_properties = {
> optional => 1,
> renderer => 'bytes',
> },
> + confmem => {
Would it make sense, for easier reuse of code, to stick to the same
naming as in user.cfg - `foo-config`, `foo-run` here?
> + description => "Configured amount of memory (inc. swap), might be higher than 'maxmem'.",
> + type => 'integer',
> + optional => 1,
> + renderer => 'bytes',
> + },
> + runmem => {
> + description => "Currently configured amount of memory (inc. swap).",
> + type => 'integer',
> + optional => 1,
> + renderer => 'bytes',
> + },
> maxdisk => {
> description => "Root disk size in bytes.",
> type => 'integer',
> @@ -160,6 +172,16 @@ our $vmstatus_return_properties = {
> type => 'number',
> optional => 1,
> },
> + confcpus => {
> + description => "Configured amount of CPUs, might be higher than 'cpus'.",
> + type => 'integer',
> + optional => 1,
> + },
> + runcpus => {
> + description => "Currently used amount of CPUs.",
> + type => 'integer',
> + optional => 1,
> + },
> lock => {
> description => "The current config lock, if any.",
> type => 'string',
> @@ -200,6 +222,7 @@ sub vmstatus {
> my $conf = PVE::Cluster::cfs_read_file($cfspath) || {};
>
> $unprivileged->{$vmid} = $conf->{unprivileged};
> + my $usage = PVE::LXC::Config->get_pool_usage($conf);
>
> $d->{name} = $conf->{'hostname'} || "CT$vmid";
> $d->{name} =~ s/[\s]//g;
> @@ -207,6 +230,9 @@ sub vmstatus {
> $d->{cpus} = $conf->{cores} || $conf->{cpulimit};
> $d->{cpus} = $cpucount if !$d->{cpus};
>
> + $d->{confcpus} = $usage->{cpu};
> + $d->{runcpus} = $conf->{cores} || $cpucount;
> +
> $d->{tags} = $conf->{tags} if defined($conf->{tags});
>
> if ($d->{pid}) {
> @@ -229,6 +255,9 @@ sub vmstatus {
> $d->{maxmem} = ($conf->{memory}||512)*1024*1024;
> $d->{maxswap} = ($conf->{swap}//0)*1024*1024;
>
> + $d->{confmem} = $usage->{mem};
> + $d->{runmem} = $conf->{maxmem} + $conf->{swap};
> +
> $d->{uptime} = 0;
> $d->{cpu} = 0;
>
> --
> 2.39.2