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
};
}
- my $used;
-
- $used = 'LVM' if $lvmhash->{$devpath};
-
- $used = 'mounted' if $mounted->{$devpath};
-
- $used = 'ZFS' if $zfshash->{$devpath};
-
- if (defined($lsblk_info->{$devpath})) {
- my $fstype = $lsblk_info->{$devpath}->{fstype};
- if (defined($fstype)) {
- $used = $fstype;
- $used .= ' (mounted)' if $mounted->{$devpath};
- }
- }
-
# we replaced cciss/ with cciss! above
# but in the result we need cciss/ again
# because the caller might want to check the
my $db_count = 0;
my $wal_count = 0;
- my $found_partitions;
- my $found_lvm;
- my $found_mountpoints;
- my $found_zfs;
- my $found_dm;
my $partpath = $devpath;
# remove part after last / to
# e.g. from /dev/cciss/c0d0 get /dev/cciss
$partpath =~ s/\/[^\/]+$//;
+ my $determine_usage = sub {
+ my ($devpath, $sysdir, $is_partition) = @_;
+
+ return 'LVM' if $lvmhash->{$devpath};
+ 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};
+ return "${fstype}";
+ }
+ return 'mounted' if $mounted->{$devpath};
+
+ return if !$is_partition;
+
+ # for devices, this check is done explicitly later
+ return 'Device Mapper' if !dir_is_empty("$sysdir/holders");
+
+ 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) = @_;
- $found_partitions = 1;
+ $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"}) {
- $found_mountpoints = 1;
if ($mp =~ m|^/var/lib/ceph/osd/ceph-(\d+)$|) {
$osdid = $1;
+ $partitions->{$part}->{osdid} = $osdid;
}
}
- if ($lvmhash->{"$partpath/$part"}) {
- $found_lvm = 1;
- }
-
- if ($zfshash->{"$partpath/$part"}) {
- $found_zfs = 1;
- }
-
if (my $journal_part = $journalhash->{"$partpath/$part"}) {
$journal_count++ if $journal_part == 1;
$db_count++ if $journal_part == 2;
$wal_count++ if $journal_part == 3;
$bluestore = 1 if $journal_part == 4;
- }
- if (!dir_is_empty("$sysdir/$part/holders") && !$found_lvm) {
- $found_dm = 1;
+ $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;
}
});
- 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};
- }
+ my $used = $determine_usage->($devpath, $sysdir, 0);
+ foreach my $part (sort keys %{$partitions}) {
+ next if $partitions->{$part}->{used} eq 'partition';
+ $used //= $partitions->{$part}->{used};
}
-
- $used = 'mounted' if $found_mountpoints && !$used;
- $used = 'LVM' if $found_lvm && !$used;
- $used = 'ZFS' if $found_zfs && !$used;
- $used = 'Device Mapper' if $found_dm && !$used;
- $used = 'partitions' if $found_partitions && !$used;
-
+ $used //= 'partitions' if scalar(keys %{$partitions});
# multipath, software raid, etc.
# this check comes in last, to show more specific info
# if we have it
- $used = 'Device Mapper' if !$used && !dir_is_empty("$sysdir/holders");
+ $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;
projects / pve-storage.git / blobdiff