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 DE2499458E for ; Wed, 10 Apr 2024 15:13:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1365C1051C for ; Wed, 10 Apr 2024 15:13:31 +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 ; Wed, 10 Apr 2024 15:13:30 +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 680DE43B1A for ; Wed, 10 Apr 2024 15:13:30 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 15:13:09 +0200 Message-Id: <20240410131316.1208679-13-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410131316.1208679-1-f.gruenbichler@proxmox.com> References: <20240410131316.1208679-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.057 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 manager 3/4] api: return pool usage when queried 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: Wed, 10 Apr 2024 13:13:31 -0000 Signed-off-by: Fabian Grünbichler --- PVE/API2/Pool.pm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm index 26ff7742e..9c232a971 100644 --- a/PVE/API2/Pool.pm +++ b/PVE/API2/Pool.pm @@ -6,6 +6,7 @@ use warnings; use PVE::AccessControl; use PVE::Cluster qw (cfs_read_file cfs_write_file); use PVE::Exception qw(raise_param_exc); +use PVE::GuestHelpers; use PVE::INotify; use PVE::JSONSchema qw(get_standard_option parse_property_string print_property_string); use PVE::Storage; @@ -78,6 +79,7 @@ __PACKAGE__->register_method ({ }, }, limits => { type => 'string', optional => 1 }, + usage => { type => 'object', optional => 1 }, }, }, links => [ { rel => 'child', href => "{poolid}" } ], @@ -135,17 +137,30 @@ __PACKAGE__->register_method ({ members => $members, }; $pool_info->{comment} = $pool_config->{comment} if defined($pool_config->{comment}); - $pool_info->{limits} = print_property_string($pool_config->{limits}, 'pve-pool-limits') - if defined($pool_config->{limits}); $pool_info->{poolid} = $poolid; + my $usage = PVE::Cluster::get_node_kv('pool-usage'); + $usage = PVE::GuestHelpers::get_pool_usage($usercfg->{pools}, $usage, $poolid); + if (my $limits = $pool_config->{limits}) { + $pool_info->{limits} = print_property_string($limits, 'pve-pool-limits'); + $usage->{$poolid}->{over} = PVE::GuestHelpers::check_pool_limits($usage->{$poolid}, $limits, 1); + } + $pool_info->{usage} = $usage->{$poolid}; + push @$res, $pool_info; } else { + my $usage = PVE::Cluster::get_node_kv('pool-usage'); + $usage = PVE::GuestHelpers::get_pool_usage($usercfg->{pools}, $usage); for my $pool (sort keys %{$usercfg->{pools}}) { next if !$rpcenv->check($authuser, "/pool/$pool", [ 'Pool.Audit' ], 1); my $entry = { poolid => $pool }; my $pool_config = $usercfg->{pools}->{$pool}; + if (my $limits = $pool_config->{limits}) { + $usage->{$pool}->{over} = PVE::GuestHelpers::check_pool_limits($usage->{$pool}, $limits, 1); + $entry->{limits} = print_property_string($limits, 'pve-pool-limits'); + } + $entry->{usage} = $usage->{$pool}; $entry->{comment} = $pool_config->{comment} if defined($pool_config->{comment}); push @$res, $entry; } -- 2.39.2