use strict;
use warnings;
+
use PVE::ProcFSTools;
use Data::Dumper;
use Cwd qw(abs_path);
use Fcntl ':mode';
+use File::stat;
use JSON;
use PVE::Tools qw(extract_param run_command file_get_contents file_read_firstline dir_glob_regex dir_glob_foreach trim);
my $SGDISK = "/sbin/sgdisk";
my $PVS = "/sbin/pvs";
my $LVS = "/sbin/lvs";
-my $UDEVADM = "/bin/udevadm";
my $LSBLK = "/bin/lsblk";
sub verify_blockdev_path {
if (defined($type) && $type eq 'ata' && $line =~ m/^([ \d]{2}\d)\s+(\S+)\s+(\S{6})\s+(\d+)\s+(\d+)\s+(\S+)\s+(\S+)\s+(.*)$/) {
my $entry = {};
-
$entry->{name} = $2 if defined $2;
$entry->{flags} = $3 if defined $3;
# the +0 makes a number out of the strings
} elsif (defined($type) && $type eq 'text') {
$smartdata->{text} = '' if !defined $smartdata->{text};
$smartdata->{text} .= "$line\n";
- # extract wearout from nvme text, allow for decimal values
- if ($line =~ m/Percentage Used:.*(\d+(?:\.\d+)?)\%/i) {
+ # extract wearout from nvme/sas text, allow for decimal values
+ if ($line =~ m/Percentage Used(?: endurance indicator)?:\s*(\d+(?:\.\d+)?)\%/i) {
$smartdata->{wearout} = 100 - $1;
}
} elsif ($line =~ m/SMART Disabled/) {
if (($type eq 'block' || $type eq 'data') && $fields->[2] =~ m/ceph.osd_id=([^,]+)/) {
$result->{$dev}->{osdid} = $1;
$result->{$dev}->{bluestore} = ($type eq 'block');
+ if ($fields->[2] =~ m/ceph\.encrypted=1/) {
+ $result->{$dev}->{encrypted} = 1;
+ }
} else {
# undef++ becomes '1' (see `perldoc perlop`: Auto-increment)
$result->{$dev}->{$type}++;
my $info = "";
my $data = {};
eval {
- run_command([$UDEVADM, 'info', '-p', $dev, '--query', 'all'], outfunc => sub {
+ run_command(['udevadm', 'info', '-p', $dev, '--query', 'all'], outfunc => sub {
my ($line) = @_;
$info .= "$line\n";
});
$data->{wwn} = $1;
}
+ if ($info =~ m/^E: DEVLINKS=(.+)$/m) {
+ my @devlinks = grep(m#^/dev/disk/by-id/(ata|scsi|nvme(?!-eui))#, split (/ /, $1));
+ $data->{by_id_link} = $devlinks[0] if defined($devlinks[0]);
+ }
+
return $data;
}
}
sub get_wear_leveling_info {
- my ($smartdata, $model) = @_;
+ my ($smartdata) = @_;
my $attributes = $smartdata->{attributes};
if (defined($smartdata->{wearout})) {
my $wearout;
- my $vendormap = {
- 'kingston' => 231,
- 'samsung' => 177,
- 'intel' => 233,
- 'sandisk' => 233,
- 'crucial' => 202,
- 'default' => 233,
- };
-
- # find target attr id
-
- my $attrid;
-
- foreach my $vendor (keys %$vendormap) {
- if ($model =~ m/$vendor/i) {
- $attrid = $vendormap->{$vendor};
- # found the attribute
- last;
+ # Common register names that represent percentage values of potential
+ # failure indicators used in drivedb.h of smartmontool's. Order matters,
+ # as some drives may have multiple definitions
+ my @wearoutregisters = (
+ "Media_Wearout_Indicator",
+ "SSD_Life_Left",
+ "Wear_Leveling_Count",
+ "Perc_Write\/Erase_Ct_BC",
+ "Perc_Rated_Life_Remain",
+ "Remaining_Lifetime_Perc",
+ "Percent_Lifetime_Remain",
+ "Lifetime_Left",
+ "PCT_Life_Remaining",
+ "Lifetime_Remaining",
+ "Percent_Life_Remaining",
+ "Percent_Lifetime_Used",
+ "Perc_Rated_Life_Used"
+ );
+
+ # Search for S.M.A.R.T. attributes for known register
+ foreach my $register (@wearoutregisters) {
+ last if defined $wearout;
+ foreach my $attr (@$attributes) {
+ next if $attr->{name} !~ m/$register/;
+ $wearout = $attr->{value};
+ last;
}
}
- if (!$attrid) {
- $attrid = $vendormap->{default};
- }
-
- foreach my $attr (@$attributes) {
- next if $attr->{id} != $attrid;
- $wearout = $attr->{value};
- last;
- }
-
return $wearout;
}
return 0;
}
+my sub is_ssdlike {
+ my ($type) = @_;
+ return $type eq 'ssd' || $type eq 'nvme';
+}
+
sub get_disks {
my ($disks, $nosmart) = @_;
my $disklist = {};
die "disks is not a string or array reference\n";
}
# we get cciss/c0d0 but need cciss!c0d0
- map { s|cciss/|cciss!| } @$disks;
+ $_ =~ s|cciss/|cciss!| for @$disks;
$disk_regex = "(?:" . join('|', @$disks) . ")";
}
if ($sysdata->{rotational} == 0) {
$type = 'ssd';
+ $type = 'nvme' if $dev =~ m/^nvme\d+n\d+$/;
$data->{rpm} = 0;
} elsif ($sysdata->{rotational} == 1) {
if ($data->{rpm} != -1) {
if (!$nosmart) {
eval {
- my $smartdata = get_smart_data($devpath, ($type ne 'ssd'));
+ my $smartdata = get_smart_data($devpath, !is_ssdlike($type));
$health = $smartdata->{health} if $smartdata->{health};
- if ($type eq 'ssd') {
+ if (is_ssdlike($type)) {
# if we have an ssd we try to get the wearout indicator
- my $wearval = get_wear_leveling_info($smartdata, $data->{model} || $sysdata->{model});
+ my $wearval = get_wear_leveling_info($smartdata);
$wearout = $wearval if defined($wearval);
}
};
wearout => $wearout,
};
+ my $by_id_link = $data->{by_id_link};
+ $disklist->{$dev}->{by_id_link} = $by_id_link if defined($by_id_link);
+
my $osdid = -1;
my $bluestore = 0;
+ my $osdencrypted = 0;
my $journal_count = 0;
my $db_count = 0;
if (defined($ceph_volume->{osdid})) {
$osdid = $ceph_volume->{osdid};
$bluestore = 1 if $ceph_volume->{bluestore};
+ $osdencrypted = 1 if $ceph_volume->{encrypted};
}
}
$disklist->{$dev}->{osdid} = $osdid;
$disklist->{$dev}->{journals} = $journal_count if $journal_count;
$disklist->{$dev}->{bluestore} = $bluestore if $osdid != -1;
+ $disklist->{$dev}->{osdencrypted} = $osdencrypted if $osdid != -1;
$disklist->{$dev}->{db} = $db_count if $db_count;
$disklist->{$dev}->{wal} = $wal_count if $wal_count;
});
sub get_partnum {
my ($part_path) = @_;
- my ($mode, $rdev) = (stat($part_path))[2,6];
+ my $st = stat($part_path);
- next if !$mode || !S_ISBLK($mode) || !$rdev;
- my $major = PVE::Tools::dev_t_major($rdev);
- my $minor = PVE::Tools::dev_t_minor($rdev);
+ next if !$st->mode || !S_ISBLK($st->mode) || !$st->rdev;
+ my $major = PVE::Tools::dev_t_major($st->rdev);
+ my $minor = PVE::Tools::dev_t_minor($st->rdev);
my $partnum_path = "/sys/dev/block/$major:$minor/";
my $partnum;
$partnum = file_read_firstline("${partnum_path}partition");
- die "Partition does not exists\n" if !defined($partnum);
+ die "Partition does not exist\n" if !defined($partnum);
#untaint and ensure it is a int
if ($partnum =~ m/(\d+)/) {
sub get_blockdev {
my ($part_path) = @_;
- my $dev = $1 if $part_path =~ m|^/dev/(.*)$|;
- my $link = readlink "/sys/class/block/$dev";
- my $block_dev = $1 if $link =~ m|([^/]*)/$dev$|;
+ my ($dev, $block_dev);
+ if ($part_path =~ m|^/dev/(.*)$|) {
+ $dev = $1;
+ my $link = readlink "/sys/class/block/$dev";
+ $block_dev = $1 if $link =~ m|([^/]*)/$dev$|;
+ }
die "Can't parse parent device\n" if !defined($block_dev);
die "No valid block device\n" if index($dev, $block_dev) == -1;
projects / pve-storage.git / blobdiff