From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH container 2/7] status: add pool usage fields
Date: Thu, 11 Apr 2024 11:28:14 +0200 [thread overview]
Message-ID: <higoazjtpw6jpafk5o65evbxne45p675l7xlf5rnunhyvp73ia@zjaxhwnprb74> (raw)
In-Reply-To: <20240410131316.1208679-4-f.gruenbichler@proxmox.com>
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
next prev parent reply other threads:[~2024-04-11 9:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 13:12 [pve-devel] [RFC qemu-server/pve-container/.. 0/19] pool resource limits Fabian Grünbichler
2024-04-10 13:12 ` [pve-devel] [PATCH access-control 1/1] pools: define " Fabian Grünbichler
2024-04-10 13:12 ` [pve-devel] [PATCH container 1/7] config: add pool usage helper Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH container 2/7] status: add pool usage fields Fabian Grünbichler
2024-04-11 9:28 ` Wolfgang Bumiller [this message]
2024-04-15 9:32 ` Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH container 3/7] create/restore/clone: handle pool limits Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH container 4/7] start: " Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH container 5/7] hotplug: " Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH container 6/7] rollback: " Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH container 7/7] update: " Fabian Grünbichler
2024-04-11 7:23 ` Fabian Grünbichler
2024-04-11 10:03 ` Wolfgang Bumiller
2024-04-15 9:35 ` Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH guest-common 1/1] helpers: add pool limit/usage helpers Fabian Grünbichler
2024-04-11 9:17 ` Wolfgang Bumiller
2024-04-15 9:38 ` Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH manager 1/4] api: pools: add limits management Fabian Grünbichler
2024-04-11 9:24 ` Wolfgang Bumiller
2024-04-10 13:13 ` [pve-devel] [PATCH manager 2/4] pvestatd: collect and broadcast pool usage Fabian Grünbichler
2024-04-11 9:32 ` Wolfgang Bumiller
2024-04-15 12:36 ` Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH manager 3/4] api: return pool usage when queried Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH manager 4/4] ui: add pool limits and usage Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH qemu-server 1/6] config: add pool usage helper Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH qemu-server 2/6] vmstatus: add usage values for pool limits Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH qemu-server 3/6] create/restore/clone: handle " Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH qemu-server 4/6] update/hotplug: " Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH qemu-server 5/6] start: " Fabian Grünbichler
2024-04-10 13:13 ` [pve-devel] [PATCH qemu-server 6/6] rollback: " Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=higoazjtpw6jpafk5o65evbxne45p675l7xlf5rnunhyvp73ia@zjaxhwnprb74 \
--to=w.bumiller@proxmox.com \
--cc=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox