From: Daniel Kral <d.kral@proxmox.com>
To: f.gruenbichler@proxmox.com
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH v2 manager 2/4] pvestatd: collect and broadcast pool usage
Date: Thu, 19 Dec 2024 17:06:28 +0100 [thread overview]
Message-ID: <20241219160628.185966-1-d.kral@proxmox.com> (raw)
In-Reply-To: <20240416122054.733817-12-f.gruenbichler@proxmox.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5668 bytes --]
This could only be partially applied because of changes to
`update_{qemu,lxc}_status` in the mean time:
Patch failed at 0002 pvestatd: collect and broadcast pool usage
patching file PVE/Service/pvestatd.pm
Hunk #1 FAILED at 231.
Hunk #2 succeeded at 245 (offset 3 lines).
Hunk #3 succeeded at 283 with fuzz 1 (offset 5 lines).
Hunk #4 FAILED at 466.
Hunk #5 succeeded at 480 (offset 5 lines).
Hunk #6 succeeded at 592 with fuzz 1 (offset 11 lines).
Hunk #7 FAILED at 593.
Inlined the changes to resolve conflicts when applying onto ead665d5
("ui: ceph pool: add columns for application").
On 16/04/2024 14:20, Fabian Grünbichler wrote:
> so that other nodes can query it and both block changes that would violate the
> limits, and mark pools which are violating it currently accordingly.
>
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
> PVE/Service/pvestatd.pm | 59 ++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 55 insertions(+), 4 deletions(-)
>
> diff --git a/PVE/Service/pvestatd.pm b/PVE/Service/pvestatd.pm
> index 2515120c6..d7e4755e9 100755
> --- a/PVE/Service/pvestatd.pm
> +++ b/PVE/Service/pvestatd.pm
> @@ -231,7 +231,7 @@ sub auto_balloning {
> }
>
> sub update_qemu_status {
> - my ($status_cfg) = @_;
> + my ($status_cfg, $pool_membership, $pool_usage) = @_;
This should be
```
- my ($status_cfg, $pull_txn) = @_;
+ my ($status_cfg, $pull_txn, $pool_membership, $pool_usage) = @_;
```
as of ead665d5 ("ui: ceph pool: add columns for application").
>
> my $ctime = time();
> my $vmstatus = PVE::QemuServer::vmstatus(undef, 1);
> @@ -242,6 +242,21 @@ sub update_qemu_status {
> my $transactions = PVE::ExtMetric::transactions_start($status_cfg);
> foreach my $vmid (keys %$vmstatus) {
> my $d = $vmstatus->{$vmid};
> +
> + if (my $pool = $pool_membership->{$vmid}) {
> + $pool_usage->{$pool}->{$vmid} = {
> + cpu => {
> + config => ($d->{confcpus} // 0),
> + run => ($d->{runcpus} // 0),
> + },
> + mem => {
> + config => ($d->{confmem} // 0),
> + run => ($d->{runmem} // 0),
> + },
> + running => $d->{pid} ? 1 : 0,
> + };
> + }
> +
> my $data;
> my $status = $d->{qmpstatus} || $d->{status} || 'stopped';
> my $template = $d->{template} ? $d->{template} : "0";
> @@ -263,6 +278,17 @@ sub update_qemu_status {
> PVE::ExtMetric::transactions_finish($transactions);
> }
>
> +sub update_pool_usage {
> + my ($usage) = @_;
> +
> + my $ctime = time();
> +
> + # TODO? RRD and ExtMetric support here?
> +
> + my $new = { data => $usage, timestamp => $ctime };
> + PVE::Cluster::broadcast_node_kv('pool-usage', encode_json($new));
> +}
> +
> sub remove_stale_lxc_consoles {
>
> my $vmstatus = PVE::LXC::vmstatus();
> @@ -440,7 +466,7 @@ sub rebalance_lxc_containers {
> }
>
> sub update_lxc_status {
> - my ($status_cfg) = @_;
> + my ($status_cfg, $pool_membership, $pool_usage) = @_;
This should be
```
- my ($status_cfg, $pull_txn) = @_;
+ my ($status_cfg, $pull_txn, $pool_membership, $pool_usage) = @_;
```
>
> my $ctime = time();
> my $vmstatus = PVE::LXC::vmstatus();
> @@ -449,6 +475,21 @@ sub update_lxc_status {
>
> foreach my $vmid (keys %$vmstatus) {
> my $d = $vmstatus->{$vmid};
> +
> + if (my $pool = $pool_membership->{$vmid}) {
> + $pool_usage->{$pool}->{$vmid} = {
> + cpu => {
> + config => ($d->{confcpus} // 0),
> + run => ($d->{runcpus} // 0),
> + },
> + mem => {
> + config => ($d->{confmem} // 0),
> + run => ($d->{runmem} // 0),
> + },
> + running => $d->{status} eq 'running' ? 1 : 0,
> + };
> + }
> +
> my $template = $d->{template} ? $d->{template} : "0";
> my $data;
> if ($d->{status} eq 'running') { # running
> @@ -540,6 +581,10 @@ sub update_status {
> syslog('err', $err) if $err;
>
> my $status_cfg = PVE::Cluster::cfs_read_file('status.cfg');
> + my $user_cfg = PVE::Cluster::cfs_read_file('user.cfg');
> + my $pools = $user_cfg->{pools};
> + my $pool_membership = $user_cfg->{vms};
> + my $pool_usage = {};
>
> eval {
> update_node_status($status_cfg);
> @@ -548,17 +593,23 @@ sub update_status {
> syslog('err', "node status update error: $err") if $err;
>
> eval {
> - update_qemu_status($status_cfg);
> + update_qemu_status($status_cfg, $pool_membership, $pool_usage);
This should be
```
- update_qemu_status($status_cfg, $pull_txn);
+ update_qemu_status($status_cfg, $pull_txn, $pool_membership, $pool_usage);
```
> };
> $err = $@;
> syslog('err', "qemu status update error: $err") if $err;
>
> eval {
> - update_lxc_status($status_cfg);
> + update_lxc_status($status_cfg, $pool_membership, $pool_usage);
```
- update_lxc_status($status_cfg, $pull_txn);
+ update_lxc_status($status_cfg, $pull_txn, $pool_membership, $pool_usage);
```
> };
> $err = $@;
> syslog('err', "lxc status update error: $err") if $err;
>
> + eval {
> + update_pool_usage($pool_usage);
> + };
> + $err =$@;
nit: missing whitespace between `=` and `$@`.
> + syslog('err', "pool usage status update error: $err") if $err;
> +
> eval {
> rebalance_lxc_containers();
> };
> --
> 2.39.2
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-12-19 16:07 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 12:20 [pve-devel] [PATCH v2 qemu-server/pve-container 0/19] pool resource limits Fabian Grünbichler
2024-04-16 12:20 ` [pve-devel] [PATCH v2 access-control 1/1] pools: define " Fabian Grünbichler
2024-12-19 16:01 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 container 1/7] config: add pool usage helper Fabian Grünbichler
2024-12-19 16:01 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 container 2/7] status: add pool usage fields Fabian Grünbichler
2024-12-19 16:02 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 container 3/7] create/restore/clone: handle pool limits Fabian Grünbichler
2024-04-16 12:20 ` [pve-devel] [PATCH v2 container 4/7] start: " Fabian Grünbichler
2024-04-16 12:20 ` [pve-devel] [PATCH v2 container 5/7] hotplug: " Fabian Grünbichler
2024-12-19 16:03 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 container 6/7] rollback: " Fabian Grünbichler
2024-04-16 12:20 ` [pve-devel] [PATCH v2 container 7/7] update: " Fabian Grünbichler
2024-12-19 16:04 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 guest-common 1/1] helpers: add pool limit/usage helpers Fabian Grünbichler
2024-12-19 16:04 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 manager 1/4] api: pools: add limits management Fabian Grünbichler
2024-12-19 16:05 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 manager 2/4] pvestatd: collect and broadcast pool usage Fabian Grünbichler
2024-12-19 16:06 ` Daniel Kral [this message]
2024-04-16 12:20 ` [pve-devel] [PATCH v2 manager 3/4] api: return pool usage when queried Fabian Grünbichler
2024-04-16 12:20 ` [pve-devel] [PATCH v2 manager 4/4] ui: add pool limits and usage Fabian Grünbichler
2024-12-19 16:07 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 qemu-server 1/6] config: add pool usage helper Fabian Grünbichler
2024-12-19 16:08 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 qemu-server 2/6] vmstatus: add usage values for pool limits Fabian Grünbichler
2024-12-19 16:08 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 qemu-server 3/6] create/restore/clone: handle " Fabian Grünbichler
2024-04-16 12:20 ` [pve-devel] [PATCH v2 qemu-server 4/6] update/hotplug: " Fabian Grünbichler
2024-12-19 16:09 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 qemu-server 5/6] start: " Fabian Grünbichler
2024-12-19 16:09 ` Daniel Kral
2024-04-16 12:20 ` [pve-devel] [PATCH v2 qemu-server 6/6] rollback: " Fabian Grünbichler
2024-12-19 15:59 ` [pve-devel] [PATCH v2 qemu-server/pve-container 0/19] pool resource limits Daniel Kral
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=20241219160628.185966-1-d.kral@proxmox.com \
--to=d.kral@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