Diskmanage: save OSD information for individual partitions

[pve-storage.git] / PVE / Diskmanage.pm

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 431316122bf0078ffaeb3c754a4fa5d117221f5d..7c07e52c7cc46d9d0d62f5357670fc093bb51822 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -287,7 +287,7 @@ sub get_ceph_volume_infos {
        my $fields = [ split(';', $line) ];
 
        # lvs syntax is /dev/sdX(Y) where Y is the start (which we do not need)
-       my ($dev) = $fields->[0] =~ m|^(/dev/[a-z]+)|;
+       my ($dev) = $fields->[0] =~ m|^(/dev/[a-z]+[^(]*)|;
        if ($fields->[1] =~ m|^osd-([^-]+)-|) {
            my $type = $1;
            # $result autovivification is wanted, to not creating empty hashes
@@ -612,6 +612,17 @@ sub get_disks {
            return 'ZFS' if $zfshash->{$devpath};
 
            my $info = $lsblk_info->{$devpath} // {};
+
+           my $parttype = $info->{parttype};
+           if (defined($parttype)) {
+               return 'BIOS boot'
+                   if $parttype eq '21686148-6449-6e6f-744e-656564454649';
+               return 'EFI'
+                   if $parttype eq 'c12a7328-f81f-11d2-ba4b-00a0c93ec93b';
+               return 'ZFS reserved'
+                   if $parttype eq '6a945a3b-1dd2-11b2-99a6-080020736631';
+           }
+
            my $fstype = $info->{fstype};
            if (defined($fstype)) {
                return "${fstype} (mounted)" if $mounted->{$devpath};
@@ -627,21 +638,51 @@ sub get_disks {
            return 'partition';
        };
 
+       my $collect_ceph_info = sub {
+           my ($devpath) = @_;
+
+           my $ceph_volume = $ceph_volume_infos->{$devpath} or return;
+           $journal_count += $ceph_volume->{journal} // 0;
+           $db_count += $ceph_volume->{db} // 0;
+           $wal_count += $ceph_volume->{wal} // 0;
+           if (defined($ceph_volume->{osdid})) {
+               $osdid = $ceph_volume->{osdid};
+               $bluestore = 1 if $ceph_volume->{bluestore};
+               $osdencrypted = 1 if $ceph_volume->{encrypted};
+           }
+
+           my $result = { %{$ceph_volume} };
+           $result->{journals} = delete $result->{journal}
+               if $result->{journal};
+           return $result;
+       };
+
        my $partitions = {};
 
        dir_glob_foreach("$sysdir", "$dev.+", sub {
            my ($part) = @_;
 
+           $partitions->{$part} = $collect_ceph_info->("$partpath/$part");
+           my $lvm_based_osd = defined($partitions->{$part});
+
            $partitions->{$part}->{devpath} = "$partpath/$part";
            $partitions->{$part}->{gpt} = $data->{gpt};
            $partitions->{$part}->{size} =
                get_sysdir_size("$sysdir/$part") // 0;
            $partitions->{$part}->{used} =
                $determine_usage->("$partpath/$part", "$sysdir/$part", 1);
+           $partitions->{$part}->{osdid} //= -1;
+
+           # Avoid counting twice (e.g. partition on which the LVM for the
+           # DB OSD resides is present in the $journalhash)
+           return if $lvm_based_osd;
+
+           # Legacy handling for non-LVM based OSDs
 
            if (my $mp = $mounted->{"$partpath/$part"}) {
                if ($mp =~ m|^/var/lib/ceph/osd/ceph-(\d+)$|) {
                    $osdid = $1;
+                   $partitions->{$part}->{osdid} = $osdid;
                }
            }
 
@@ -650,19 +691,13 @@ sub get_disks {
                $db_count++ if $journal_part == 2;
                $wal_count++ if $journal_part == 3;
                $bluestore = 1 if $journal_part == 4;
-           }
-       });
 
-       if (my $ceph_volume = $ceph_volume_infos->{$devpath}) {
-           $journal_count += $ceph_volume->{journal} // 0;
-           $db_count += $ceph_volume->{db} // 0;
-           $wal_count += $ceph_volume->{wal} // 0;
-           if (defined($ceph_volume->{osdid})) {
-               $osdid = $ceph_volume->{osdid};
-               $bluestore = 1 if $ceph_volume->{bluestore};
-               $osdencrypted = 1 if $ceph_volume->{encrypted};
+               $partitions->{$part}->{journals} = 1 if $journal_part == 1;
+               $partitions->{$part}->{db} = 1 if $journal_part == 2;
+               $partitions->{$part}->{wal} = 1 if $journal_part == 3;
+               $partitions->{$part}->{bluestore} = 1 if $journal_part == 4;
            }
-       }
+       });
 
        my $used = $determine_usage->($devpath, $sysdir, 0);
        foreach my $part (sort keys %{$partitions}) {
@@ -676,6 +711,9 @@ sub get_disks {
        $used //= 'Device Mapper' if !dir_is_empty("$sysdir/holders");
 
        $disklist->{$dev}->{used} = $used if $used;
+
+       $collect_ceph_info->($devpath);
+
        $disklist->{$dev}->{osdid} = $osdid;
        $disklist->{$dev}->{journals} = $journal_count if $journal_count;
        $disklist->{$dev}->{bluestore} = $bluestore if $osdid != -1;