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 3725796B6E for ; Tue, 16 Apr 2024 14:21:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 04D0F1A5F9 for ; Tue, 16 Apr 2024 14:21:09 +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:21:07 +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 A0F13450BE for ; Tue, 16 Apr 2024 14:21:07 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 14:20:46 +0200 Message-Id: <20240416122054.733817-12-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 manager 2/4] pvestatd: collect and broadcast pool usage 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:21:09 -0000 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 --- 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) = @_; 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) = @_; 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); }; $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); }; $err = $@; syslog('err', "lxc status update error: $err") if $err; + eval { + update_pool_usage($pool_usage); + }; + $err =$@; + syslog('err', "pool usage status update error: $err") if $err; + eval { rebalance_lxc_containers(); }; -- 2.39.2