From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, h.laimer@proxmox.com
Subject: Re: [pve-devel] [PATCH pve-manager v2] api: add 'type' parameter to pool GET endpoint
Date: Mon, 31 Jan 2022 11:19:33 +0100 [thread overview]
Message-ID: <8ffb637d-65f1-5478-b407-7b4fa0bb8e93@proxmox.com> (raw)
In-Reply-To: <7a6a2bb6-2b50-5586-4f4e-667bfc4162b5@proxmox.com>
Am 31.01.22 um 11:11 schrieb Fabian Ebner:
> Am 31.01.22 um 09:41 schrieb Hannes Laimer:
>> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
>> ---
>> v2(based on Thomas Lamprecht <t.lamprecht@proxmox.com>'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.
Or maybe not, if $scfg->{nodes} can be an empty hash..
>
>> }
>> - }
>>
>> - 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 = {
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
prev parent reply other threads:[~2022-01-31 10:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-31 8:41 Hannes Laimer
2022-01-31 10:11 ` Fabian Ebner
2022-01-31 10:19 ` Fabian Ebner [this message]
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=8ffb637d-65f1-5478-b407-7b4fa0bb8e93@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=h.laimer@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.