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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9416B64F07 for ; Mon, 31 Jan 2022 11:12:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7D6A122AA0 for ; Mon, 31 Jan 2022 11:11:58 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DAC9422A94 for ; Mon, 31 Jan 2022 11:11:57 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 835B141B5A for ; Mon, 31 Jan 2022 11:11:57 +0100 (CET) Message-ID: <7a6a2bb6-2b50-5586-4f4e-667bfc4162b5@proxmox.com> Date: Mon, 31 Jan 2022 11:11:56 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: pve-devel@lists.proxmox.com, h.laimer@proxmox.com References: <20220131084128.2449-1-h.laimer@proxmox.com> From: Fabian Ebner In-Reply-To: <20220131084128.2449-1-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.138 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH pve-manager v2] api: add 'type' parameter to pool GET endpoint 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, 31 Jan 2022 10:12:28 -0000 Am 31.01.22 um 09:41 schrieb Hannes Laimer: > Signed-off-by: Hannes Laimer > --- > v2(based on Thomas Lamprecht 's feedback): > - remove openzv > - optimize loops > > This was asked in a forum post, and it does not interfere with > anything else AFAIK. > > PVE/API2/Pool.pm | 33 ++++++++++++++++++++------------- > 1 file changed, 20 insertions(+), 13 deletions(-) > > diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm > index 28c29ab8..ae31addf 100644 > --- a/PVE/API2/Pool.pm > +++ b/PVE/API2/Pool.pm > @@ -211,6 +211,11 @@ __PACKAGE__->register_method ({ > type => 'string', > format => 'pve-poolid', > }, > + type => { > + type => 'string', > + enum => [ 'qemu', 'lxc', 'storage' ], > + optional => 1, > + }, > }, > }, > returns => { > @@ -269,27 +274,29 @@ __PACKAGE__->register_method ({ > my $members = []; > for my $vmid (sort keys %{$pool_config->{vms}}) { > my $vmdata = $idlist->{$vmid}; > - next if !$vmdata; > + next if !$vmdata || defined($param->{type}) && $param->{type} eq $vmdata->{type}; Logic is inverted here, should be ne rather than eq. > my $entry = PVE::API2Tools::extract_vm_stats($vmid, $vmdata, $rrd); > push @$members, $entry; > } > > my $nodename = PVE::INotify::nodename(); > my $cfg = PVE::Storage::config(); > - for my $storeid (sort keys %{$pool_config->{storage}}) { > - my $scfg = PVE::Storage::storage_config ($cfg, $storeid, 1); > - next if !$scfg; > - > - my $storage_node = $nodename; # prefer local node > - if ($scfg->{nodes} && !$scfg->{nodes}->{$storage_node}) { > - for my $node (sort keys(%{$scfg->{nodes}})) { > - $storage_node = $node; > - last; > + if (!defined($param->{type}) || $param->{type} eq 'storage') { > + for my $storeid (sort keys %{$pool_config->{storage}}) { > + my $scfg = PVE::Storage::storage_config ($cfg, $storeid, 1); > + next if !$scfg; > + > + my $storage_node = $nodename; # prefer local node > + if ($scfg->{nodes} && !$scfg->{nodes}->{$storage_node}) { > + for my $node (sort keys(%{$scfg->{nodes}})) { > + $storage_node = $node; > + last; > + } Not your code, but this loop could be replaced with a simple: $storage_node = (sort keys $scfg->{nodes}->%*)[0]; You can add a patch for it if you'd like. > } > - } > > - my $entry = PVE::API2Tools::extract_storage_stats($storeid, $scfg, $storage_node, $rrd); > - push @$members, $entry; > + my $entry = PVE::API2Tools::extract_storage_stats($storeid, $scfg, $storage_node, $rrd); Style nit: >100 character line > + push @$members, $entry; > + } > } > > my $res = {