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 215886B3DE for ; Tue, 26 Jan 2021 12:45:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 132B915AF8 for ; Tue, 26 Jan 2021 12:45:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 7AACE1598E for ; Tue, 26 Jan 2021 12:45:36 +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 32C6F4611A for ; Tue, 26 Jan 2021 12:45:36 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 26 Jan 2021 12:45:27 +0100 Message-Id: <20210126114530.8753-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210126114530.8753-1-f.ebner@proxmox.com> References: <20210126114530.8753-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [disks.pm, diskmanage.pm] Subject: [pve-devel] [PATCH storage 11/14] Diskmanage: also include partitions with get_disks if flag is set 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, 26 Jan 2021 11:45:44 -0000 and have a parent key for partitions, to be able to see the associated disk in the result without having to rely on naming heuristics (just adding a number at the end doesn't work for NVMes). The disk's usage will not be based on the partitions usage if the flag is set, but will simply be 'partitions'. Signed-off-by: Fabian Ebner --- PVE/API2/Disks.pm | 19 ++++++++++++++++++- PVE/Diskmanage.pm | 17 +++++++++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/PVE/API2/Disks.pm b/PVE/API2/Disks.pm index c0456be..d2ee81d 100644 --- a/PVE/API2/Disks.pm +++ b/PVE/API2/Disks.pm @@ -88,6 +88,12 @@ __PACKAGE__->register_method ({ additionalProperties => 0, properties => { node => get_standard_option('pve-node'), + 'include-partitions' => { + description => "Also include partitions.", + type => 'boolean', + optional => 1, + default => 0, + }, skipsmart => { description => "Skip smart checks.", type => 'boolean', @@ -120,6 +126,12 @@ __PACKAGE__->register_method ({ serial => { type => 'string', optional => 1 }, wwn => { type => 'string', optional => 1}, health => { type => 'string', optional => 1}, + parent => { + type => 'string', + description => 'For partitions only. The device path of ' . + 'the disk the partition resides on.', + optional => 1 + }, }, }, }, @@ -127,8 +139,13 @@ __PACKAGE__->register_method ({ my ($param) = @_; my $skipsmart = $param->{skipsmart} // 0; + my $include_partitions = $param->{'include-partitions'} // 0; - my $disks = PVE::Diskmanage::get_disks(undef, $skipsmart); + my $disks = PVE::Diskmanage::get_disks( + undef, + $skipsmart, + $include_partitions + ); my $type = $param->{type} // ''; my $result = []; diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index 195b706..8967ca7 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -476,7 +476,7 @@ my sub is_ssdlike { } sub get_disks { - my ($disks, $nosmart) = @_; + my ($disks, $nosmart, $include_partitions) = @_; my $disklist = {}; my $mounted = {}; @@ -667,6 +667,7 @@ sub get_disks { my $lvm_based_osd = defined($partitions->{$part}); $partitions->{$part}->{devpath} = "$partpath/$part"; + $partitions->{$part}->{parent} = "$devpath"; $partitions->{$part}->{gpt} = $data->{gpt}; $partitions->{$part}->{size} = get_sysdir_size("$sysdir/$part") // 0; @@ -701,9 +702,11 @@ sub get_disks { }); my $used = $determine_usage->($devpath, $sysdir, 0); - foreach my $part (sort keys %{$partitions}) { - next if $partitions->{$part}->{used} eq 'partition'; - $used //= $partitions->{$part}->{used}; + if (!$include_partitions) { + foreach my $part (sort keys %{$partitions}) { + next if $partitions->{$part}->{used} eq 'partition'; + $used //= $partitions->{$part}->{used}; + } } $used //= 'partitions' if scalar(keys %{$partitions}); # multipath, software raid, etc. @@ -721,6 +724,12 @@ sub get_disks { $disklist->{$dev}->{osdencrypted} = $osdencrypted if $osdid != -1; $disklist->{$dev}->{db} = $db_count if $db_count; $disklist->{$dev}->{wal} = $wal_count if $wal_count; + + if ($include_partitions) { + foreach my $part (keys %{$partitions}) { + $disklist->{$part} = $partitions->{$part}; + } + } }); return $disklist; -- 2.20.1