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 F16326D24D for ; Mon, 27 Sep 2021 14:38:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DFC2921B8F for ; Mon, 27 Sep 2021 14:37:44 +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 id 2A08B21B7E for ; Mon, 27 Sep 2021 14:37:43 +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 E226444B03 for ; Mon, 27 Sep 2021 14:37:42 +0200 (CEST) Message-ID: Date: Mon, 27 Sep 2021 14:36:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:93.0) Gecko/20100101 Thunderbird/93.0 Content-Language: en-US To: Proxmox VE development discussion , Lorenz Stechauner References: <20210927070917.1504165-1-l.stechauner@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210927070917.1504165-1-l.stechauner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.488 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.478 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 Subject: Re: [pve-devel] [PATCH storage 1/2] pvesm: reformat cmd definitions 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, 27 Sep 2021 12:38:15 -0000 On 27.09.21 09:09, Lorenz Stechauner wrote: > Signed-off-by: Lorenz Stechauner > --- > PVE/CLI/pvesm.pm | 343 ++++++++++++++++++++++++++++++----------------- > 1 file changed, 223 insertions(+), 120 deletions(-) > > diff --git a/PVE/CLI/pvesm.pm b/PVE/CLI/pvesm.pm > index 190de91..7afbe22 100755 > --- a/PVE/CLI/pvesm.pm > +++ b/PVE/CLI/pvesm.pm > @@ -574,76 +574,143 @@ my $print_api_result = sub { > }; > > our $cmddef = { > - add => [ "PVE::API2::Storage::Config", 'create', ['type', 'storage'] ], above is <= 100 and even <= 80 cc, and we want to avoid line bloat in general, as while overly long lines are not ideal, splitting basically on a per-word basis isn't either. It's totally fine in an hash/map definition to have some lines single ones and some not. > - set => [ "PVE::API2::Storage::Config", 'update', ['storage'] ], same > - remove => [ "PVE::API2::Storage::Config", 'delete', ['storage'] ], same > - status => [ "PVE::API2::Storage::Status", 'index', [], same (but would need to use the <= 100 cc limit, which is fine here. > - { node => $nodename }, $print_status ], > - list => [ "PVE::API2::Storage::Content", 'index', ['storage'], fwiw, we could have a `my $API = 'PVE::API2::Storage::';` before the cmddef and use string interpolation, e.g.: list => [ "${API}::Content", 'index', ['storage'], { node => $nodename }, $print_content ], no hard feelings, but given that there's a lot of API module-path repetition and it adds quite a bit to the line length it could be worth it.. > - { node => $nodename }, $print_content ], > - alloc => [ "PVE::API2::Storage::Content", 'create', ['storage', 'vmid', 'filename', 'size'], > - { node => $nodename }, sub { > - my $volid = shift; > - print "successfully created '$volid'\n"; > - }], > - free => [ "PVE::API2::Storage::Content", 'delete', ['volume'], > - { node => $nodename } ], > + add => [ > + "PVE::API2::Storage::Config", > + 'create', > + ['type', 'storage'], > + ], > + set => [ > + "PVE::API2::Storage::Config", > + 'update', > + ['storage'], > + ], > + remove => [ > + "PVE::API2::Storage::Config", > + 'delete', > + ['storage'], > + ], > + status => [ > + "PVE::API2::Storage::Status", > + 'index', > + [], > + { node => $nodename }, > + $print_status, > + ], > + list => [ > + "PVE::API2::Storage::Content", > + 'index', > + ['storage'], > + { node => $nodename }, > + $print_content, > + ], > + alloc => [ > + "PVE::API2::Storage::Content", > + 'create', > + ['storage', 'vmid', 'filename', 'size'], > + { node => $nodename }, > + sub { > + my $volid = shift; > + print "successfully created '$volid'\n"; > + }, > + ], > + free => [ > + "PVE::API2::Storage::Content", > + 'delete', > + ['volume'], > + { node => $nodename }, > + ], > scan => { > - nfs => [ "PVE::API2::Storage::Scan", 'nfsscan', ['server'], { node => $nodename }, sub { > - my $res = shift; > - > - my $maxlen = 0; > - foreach my $rec (@$res) { > - my $len = length ($rec->{path}); > - $maxlen = $len if $len > $maxlen; > - } > - foreach my $rec (@$res) { > - printf "%-${maxlen}s %s\n", $rec->{path}, $rec->{options}; > - } > - }], > - cifs => [ "PVE::API2::Storage::Scan", 'cifsscan', ['server'], { node => $nodename }, sub { > - my $res = shift; > - > - my $maxlen = 0; > - foreach my $rec (@$res) { > - my $len = length ($rec->{share}); > - $maxlen = $len if $len > $maxlen; > - } > - foreach my $rec (@$res) { > - printf "%-${maxlen}s %s\n", $rec->{share}, $rec->{description}; > - } > - }], > - glusterfs => [ "PVE::API2::Storage::Scan", 'glusterfsscan', ['server'], { node => $nodename }, sub { > - my $res = shift; > - > - foreach my $rec (@$res) { > - printf "%s\n", $rec->{volname}; > - } > - }], > - iscsi => [ "PVE::API2::Storage::Scan", 'iscsiscan', ['portal'], { node => $nodename }, sub { > - my $res = shift; > + nfs => [ > + "PVE::API2::Storage::Scan", > + 'nfsscan', > + ['server'], > + { node => $nodename }, > + sub { > + my $res = shift; > + > + my $maxlen = 0; > + foreach my $rec (@$res) { > + my $len = length ($rec->{path}); > + $maxlen = $len if $len > $maxlen; > + } > + foreach my $rec (@$res) { > + printf "%-${maxlen}s %s\n", $rec->{path}, $rec->{options}; > + } > + }, > + ], > + cifs => [ > + "PVE::API2::Storage::Scan", > + 'cifsscan', > + ['server'], > + { node => $nodename }, > + sub { > + my $res = shift; > + > + my $maxlen = 0; > + foreach my $rec (@$res) { > + my $len = length ($rec->{share}); > + $maxlen = $len if $len > $maxlen; > + } > + foreach my $rec (@$res) { > + printf "%-${maxlen}s %s\n", $rec->{share}, $rec->{description}; > + } > + }, > + ], > + glusterfs => [ > + "PVE::API2::Storage::Scan", > + 'glusterfsscan', > + ['server'], > + { node => $nodename }, > + sub { > + my $res = shift; > > - my $maxlen = 0; > - foreach my $rec (@$res) { > - my $len = length ($rec->{target}); > - $maxlen = $len if $len > $maxlen; > - } > - foreach my $rec (@$res) { > - printf "%-${maxlen}s %s\n", $rec->{target}, $rec->{portal}; > - } > - }], > - lvm => [ "PVE::API2::Storage::Scan", 'lvmscan', [], { node => $nodename }, sub { > - my $res = shift; > - foreach my $rec (@$res) { > - printf "$rec->{vg}\n"; > - } > - }], > - lvmthin => [ "PVE::API2::Storage::Scan", 'lvmthinscan', ['vg'], { node => $nodename }, sub { > - my $res = shift; > - foreach my $rec (@$res) { > - printf "$rec->{lv}\n"; > - } > - }], > + foreach my $rec (@$res) { > + printf "%s\n", $rec->{volname}; > + } > + }, > + ], > + iscsi => [ > + "PVE::API2::Storage::Scan", > + 'iscsiscan', > + ['portal'], > + { node => $nodename }, > + sub { > + my $res = shift; > + > + my $maxlen = 0; > + foreach my $rec (@$res) { > + my $len = length ($rec->{target}); > + $maxlen = $len if $len > $maxlen; > + } > + foreach my $rec (@$res) { > + printf "%-${maxlen}s %s\n", $rec->{target}, $rec->{portal}; > + } > + }, > + ], > + lvm => [ > + "PVE::API2::Storage::Scan", > + 'lvmscan', > + [], > + { node => $nodename }, > + sub { > + my $res = shift; > + foreach my $rec (@$res) { > + printf "$rec->{vg}\n"; > + } > + }, > + ], > + lvmthin => [ > + "PVE::API2::Storage::Scan", > + 'lvmthinscan', > + ['vg'], > + { node => $nodename }, > + sub { > + my $res = shift; > + foreach my $rec (@$res) { > + printf "$rec->{lv}\n"; > + } > + }, > + ], > pbs => [ > "PVE::API2::Storage::Scan", > 'pbsscan', > @@ -652,13 +719,19 @@ our $cmddef = { > $print_api_result, > $PVE::RESTHandler::standard_output_options, > ], > - zfs => [ "PVE::API2::Storage::Scan", 'zfsscan', [], { node => $nodename }, sub { > - my $res = shift; > + zfs => [ > + "PVE::API2::Storage::Scan", > + 'zfsscan', > + [], > + { node => $nodename }, > + sub { > + my $res = shift; > > - foreach my $rec (@$res) { > - printf "$rec->{pool}\n"; > - } > - }], > + foreach my $rec (@$res) { > + printf "$rec->{pool}\n"; > + } > + }, > + ], > }, > nfsscan => { alias => 'scan nfs' }, > cifsscan => { alias => 'scan cifs' }, > @@ -667,55 +740,85 @@ our $cmddef = { > lvmscan => { alias => 'scan lvm' }, > lvmthinscan => { alias => 'scan lvmthin' }, > zfsscan => { alias => 'scan zfs' }, > - path => [ __PACKAGE__, 'path', ['volume']], > - extractconfig => [__PACKAGE__, 'extractconfig', ['volume']], > - export => [ __PACKAGE__, 'export', ['volume', 'format', 'filename']], > - import => [ __PACKAGE__, 'import', ['volume', 'format', 'filename'], {}, sub { > - my $volid = shift; > - print PVE::Storage::volume_imported_message($volid); > - }], > - apiinfo => [ __PACKAGE__, 'apiinfo', [], {}, sub { > - my $res = shift; > - > - print "APIVER $res->{apiver}\n"; > - print "APIAGE $res->{apiage}\n"; > - }], > - 'prune-backups' => [ __PACKAGE__, 'prunebackups', ['storage'], { node => $nodename }, sub { > - my $res = shift; > - > - my ($dryrun, $list) = ($res->{dryrun}, $res->{list}); > - > - return if !$dryrun; > - > - if (!scalar(@{$list})) { > - print "No backups found\n"; > - return; > - } > + path => [ > + __PACKAGE__, > + 'path', > + ['volume'], > + ], > + extractconfig => [ > + __PACKAGE__, > + 'extractconfig', > + ['volume'], > + ], > + export => [ > + __PACKAGE__, > + 'export', > + ['volume', 'format', 'filename'], > + ], > + import => [ > + __PACKAGE__, > + 'import', > + ['volume', 'format', 'filename'], > + {}, > + sub { > + my $volid = shift; > + print PVE::Storage::volume_imported_message($volid); > + }, > + ], > + apiinfo => [ > + __PACKAGE__, > + 'apiinfo', > + [], > + {}, > + sub { > + my $res = shift; > > - print "NOTE: this is only a preview and might not be what a subsequent\n" . > - "prune call does if backups are removed/added in the meantime.\n\n"; > + print "APIVER $res->{apiver}\n"; > + print "APIAGE $res->{apiage}\n"; > + }, > + ], > + 'prune-backups' => [ > + __PACKAGE__, > + 'prunebackups', > + ['storage'], > + { node => $nodename }, > + sub { > + my $res = shift; > > - my @sorted = sort { > - my $vmcmp = PVE::Tools::safe_compare($a->{vmid}, $b->{vmid}, sub { $_[0] <=> $_[1] }); > - return $vmcmp if $vmcmp ne 0; > - return $a->{ctime} <=> $b->{ctime}; > - } @{$list}; > + my ($dryrun, $list) = ($res->{dryrun}, $res->{list}); > > - my $maxlen = 0; > - foreach my $backup (@sorted) { > - my $volid = $backup->{volid}; > - $maxlen = length($volid) if length($volid) > $maxlen; > - } > - $maxlen+=1; > - > - printf("%-${maxlen}s %15s %10s\n", 'Backup', 'Backup-ID', 'Prune-Mark'); > - foreach my $backup (@sorted) { > - my $type = $backup->{type}; > - my $vmid = $backup->{vmid}; > - my $backup_id = defined($vmid) ? "$type/$vmid" : "$type"; > - printf("%-${maxlen}s %15s %10s\n", $backup->{volid}, $backup_id, $backup->{mark}); > - } > - }], > + return if !$dryrun; > + > + if (!scalar(@{$list})) { > + print "No backups found\n"; > + return; > + } > + > + print "NOTE: this is only a preview and might not be what a subsequent\n" . > + "prune call does if backups are removed/added in the meantime.\n\n"; > + > + my @sorted = sort { > + my $vmcmp = PVE::Tools::safe_compare($a->{vmid}, $b->{vmid}, sub { $_[0] <=> $_[1] }); > + return $vmcmp if $vmcmp ne 0; > + return $a->{ctime} <=> $b->{ctime}; > + } @{$list}; > + > + my $maxlen = 0; > + foreach my $backup (@sorted) { > + my $volid = $backup->{volid}; > + $maxlen = length($volid) if length($volid) > $maxlen; > + } > + $maxlen+=1; > + > + printf("%-${maxlen}s %15s %10s\n", 'Backup', 'Backup-ID', 'Prune-Mark'); > + foreach my $backup (@sorted) { > + my $type = $backup->{type}; > + my $vmid = $backup->{vmid}; > + my $backup_id = defined($vmid) ? "$type/$vmid" : "$type"; > + printf("%-${maxlen}s %15s %10s\n", $backup->{volid}, $backup_id, $backup->{mark}); > + } > + }, > + ], > }; > > 1; >