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 0098596125 for ; Mon, 15 Apr 2024 11:32:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D5B7C65A9 for ; Mon, 15 Apr 2024 11:32:06 +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 ; Mon, 15 Apr 2024 11:32:06 +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 096EB442FD for ; Mon, 15 Apr 2024 11:32:06 +0200 (CEST) Date: Mon, 15 Apr 2024 11:32:01 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Wolfgang Bumiller Cc: pve-devel@lists.proxmox.com References: <20240410131316.1208679-1-f.gruenbichler@proxmox.com> <20240410131316.1208679-4-f.gruenbichler@proxmox.com> In-Reply-To: MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1713173434.ybqtfsqzy3.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Apr 2024 09:32:07 -0000 On April 11, 2024 11:28 am, Wolfgang Bumiller wrote: > On Wed, Apr 10, 2024 at 03:13:00PM +0200, Fabian Gr=C3=BCnbichler wrote: >> these are similar to existing ones, but with slightly different semantic= s. >>=20 >> Signed-off-by: Fabian Gr=C3=BCnbichler >> --- >> src/PVE/LXC.pm | 29 +++++++++++++++++++++++++++++ >> 1 file changed, 29 insertions(+) >>=20 >> 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 =3D { >> optional =3D> 1, >> renderer =3D> 'bytes', >> }, >> + confmem =3D> { >=20 > Would it make sense, for easier reuse of code, to stick to the same > naming as in user.cfg - `foo-config`, `foo-run` here? then it would be inconsistent with the rest of the schema here (which is directly exported into metrics, so we can't change it easily without breaking a ton of stuff..). >> + description =3D> "Configured amount of memory (inc. swap), might be hi= gher than 'maxmem'.", >> + type =3D> 'integer', >> + optional =3D> 1, >> + renderer =3D> 'bytes', >> + }, >> + runmem =3D> { >> + description =3D> "Currently configured amount of memory (inc. swap).", >> + type =3D> 'integer', >> + optional =3D> 1, >> + renderer =3D> 'bytes', >> + }, >> maxdisk =3D> { >> description =3D> "Root disk size in bytes.", >> type =3D> 'integer', >> @@ -160,6 +172,16 @@ our $vmstatus_return_properties =3D { >> type =3D> 'number', >> optional =3D> 1, >> }, >> + confcpus =3D> { >> + description =3D> "Configured amount of CPUs, might be higher than 'cpu= s'.", >> + type =3D> 'integer', >> + optional =3D> 1, >> + }, >> + runcpus =3D> { >> + description =3D> "Currently used amount of CPUs.", >> + type =3D> 'integer', >> + optional =3D> 1, >> + }, >> lock =3D> { >> description =3D> "The current config lock, if any.", >> type =3D> 'string', >> @@ -200,6 +222,7 @@ sub vmstatus { >> my $conf =3D PVE::Cluster::cfs_read_file($cfspath) || {}; >> =20 >> $unprivileged->{$vmid} =3D $conf->{unprivileged}; >> + my $usage =3D PVE::LXC::Config->get_pool_usage($conf); >> =20 >> $d->{name} =3D $conf->{'hostname'} || "CT$vmid"; >> $d->{name} =3D~ s/[\s]//g; >> @@ -207,6 +230,9 @@ sub vmstatus { >> $d->{cpus} =3D $conf->{cores} || $conf->{cpulimit}; >> $d->{cpus} =3D $cpucount if !$d->{cpus}; >> =20 >> + $d->{confcpus} =3D $usage->{cpu}; >> + $d->{runcpus} =3D $conf->{cores} || $cpucount; >> + >> $d->{tags} =3D $conf->{tags} if defined($conf->{tags}); >> =20 >> if ($d->{pid}) { >> @@ -229,6 +255,9 @@ sub vmstatus { >> $d->{maxmem} =3D ($conf->{memory}||512)*1024*1024; >> $d->{maxswap} =3D ($conf->{swap}//0)*1024*1024; >> =20 >> + $d->{confmem} =3D $usage->{mem}; >> + $d->{runmem} =3D $conf->{maxmem} + $conf->{swap}; >> + >> $d->{uptime} =3D 0; >> $d->{cpu} =3D 0; >> =20 >> --=20 >> 2.39.2 >=20