add crucial smart attribute for wear leveling

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

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 1befd9e89214955b81a805976de42881fe91922c..5d498ce4f801e62b799a54d0ab19b98282de564c 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -97,14 +97,21 @@ sub get_smart_data {
 # Data Units Written:                 5,584,952 [2.85 TB]
 # Accumulated start-stop cycles:  34
 
-           if (defined($type) && $type eq 'ata' && $line =~ m/^([ \d]{2}\d)\s+(\S+)\s+(\S{6})\s+(\d+)\s+(\d+)\s+(\d+)\s+(\S+)\s+(.*)$/) {
+           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
                $entry->{value} = $4+0 if defined $4;
                $entry->{worst} = $5+0 if defined $5;
-               $entry->{threshold} = $6+0 if defined $6;
+               # some disks report the default threshold as --- instead of 000
+               if (defined($6) && $6 eq '---') {
+                   $entry->{threshold} = 0;
+               } else {
+                   $entry->{threshold} = $6+0 if defined $6;
+               }
                $entry->{fail} = $7 if defined $7;
                $entry->{raw} = $8 if defined $8;
                $entry->{id} = $1 if defined $1;
@@ -217,7 +224,7 @@ sub get_udev_info {
     my $info = "";
     my $data = {};
     eval {
-       run_command([$UDEVADM, 'info', '-n', $dev, '--query', 'all'], outfunc => sub {
+       run_command([$UDEVADM, 'info', '-p', $dev, '--query', 'all'], outfunc => sub {
            my ($line) = @_;
            $info .= "$line\n";
        });
@@ -255,6 +262,10 @@ sub get_udev_info {
        $data->{usb} = 1;
     }
 
+    if ($info =~ m/^E: ID_MODEL=(.+)$/m) {
+       $data->{model} = $1;
+    }
+
     $data->{wwn} = 'unknown';
     if ($info =~ m/^E: ID_WWN=(.*)$/m) {
        $data->{wwn} = $1;
@@ -266,6 +277,8 @@ sub get_udev_info {
 sub get_sysdir_info {
     my ($sysdir) = @_;
 
+    return undef if ! -d "$sysdir/device";
+
     my $data = {};
 
     my $size = file_read_firstline("$sysdir/size");
@@ -276,7 +289,7 @@ sub get_sysdir_info {
     $data->{size} = $size * 512;
 
     # dir/queue/rotational should be 1 for hdd, 0 for ssd
-    $data->{rotational} = file_read_firstline("$sysdir/queue/rotational");
+    $data->{rotational} = file_read_firstline("$sysdir/queue/rotational") // -1;
 
     $data->{vendor} = file_read_firstline("$sysdir/device/vendor") || 'unknown';
     $data->{model} = file_read_firstline("$sysdir/device/model") || 'unknown';
@@ -294,6 +307,7 @@ sub get_wear_leveling_info {
        'samsung' => 177,
        'intel' => 233,
        'sandisk' => 233,
+       'crucial' => 202,
        'default' => 233,
     };
 
@@ -301,7 +315,7 @@ sub get_wear_leveling_info {
 
     my $attrid;
 
-    foreach my $vendor (keys $vendormap) {
+    foreach my $vendor (keys %$vendormap) {
        if ($model =~ m/$vendor/i) {
            $attrid = $vendormap->{$vendor};
            # found the attribute
@@ -322,6 +336,21 @@ sub get_wear_leveling_info {
     return $wearout;
 }
 
+sub dir_is_empty {
+    my ($dir) = @_;
+
+    my $dh = IO::Dir->new ($dir);
+    return 1 if !$dh;
+
+    while (defined(my $tmp = $dh->read)) {
+       next if $tmp eq '.' || $tmp eq '..';
+       $dh->close;
+       return 0;
+    }
+    $dh->close;
+    return 1;
+}
+
 sub get_disks {
     my ($disk, $nosmart) = @_;
     my $disklist = {};
@@ -340,21 +369,6 @@ sub get_disks {
        return $mounted->{$dev};
     };
 
-    my $dir_is_empty = sub {
-       my ($dir) = @_;
-
-       my $dh = IO::Dir->new ($dir);
-       return 1 if !$dh;
-
-       while (defined(my $tmp = $dh->read)) {
-           next if $tmp eq '.' || $tmp eq '..';
-           $dh->close;
-           return 0;
-       }
-       $dh->close;
-       return 1;
-    };
-
     my $journalhash = get_ceph_journals();
 
     my $zfslist = get_zfs_devices();
@@ -370,21 +384,19 @@ sub get_disks {
        # vdX: virtual block device
        # xvdX: xen virtual block device
        # nvmeXnY: nvme devices
-       # cXnY: cciss devices
+       # cciss!cXnY: cciss devices
        return if $dev !~ m/^(h|s|x?v)d[a-z]+$/ &&
                  $dev !~ m/^nvme\d+n\d+$/ &&
-                 $dev !~ m/^c\d+d\d+$/;
+                 $dev !~ m/^cciss\!c\d+d\d+$/;
 
-       my $data = get_udev_info($dev);
+       my $data = get_udev_info("/sys/block/$dev");
        return if !defined($data);
        my $devpath = $data->{devpath};
 
        my $sysdir = "/sys/block/$dev";
 
-       return if ! -d "$sysdir/device";
-
        # we do not want iscsi devices
-       return if readlink($sysdir) =~ m|host[^/]*/session[^/]*|;
+       return if -l $sysdir && readlink($sysdir) =~ m|host[^/]*/session[^/]*|;
 
        my $sysdata = get_sysdir_info($sysdir);
        return if !defined($sysdata);
@@ -413,7 +425,7 @@ sub get_disks {
 
                if ($type eq 'ssd') {
                    # if we have an ssd we try to get the wearout indicator
-                   my $wearval = get_wear_leveling_info($smartdata->{attributes}, $sysdata->{model});
+                   my $wearval = get_wear_leveling_info($smartdata->{attributes}, $data->{model} || $sysdir->{model});
                    $wearout = $wearval if $wearval;
                }
            };
@@ -429,7 +441,7 @@ sub get_disks {
 
        $disklist->{$dev} = {
            vendor => $sysdata->{vendor},
-           model => $sysdata->{model},
+           model => $data->{model} || $sysdata->{model},
            size => $sysdata->{size},
            serial => $data->{serial},
            gpt => $data->{gpt},
@@ -479,7 +491,7 @@ sub get_disks {
 
            $journal_count++ if $journalhash->{"$partpath/$part"};
 
-           if (!&$dir_is_empty("$sysdir/$part/holders") && !$found_lvm)  {
+           if (!dir_is_empty("$sysdir/$part/holders") && !$found_lvm)  {
                $found_dm = 1;
            }
        });
@@ -493,7 +505,7 @@ sub get_disks {
        # 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 !$used && !dir_is_empty("$sysdir/holders");
 
        $disklist->{$dev}->{used} = $used if $used;
        $disklist->{$dev}->{osdid} = $osdid;