bump version to 4.0-63

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

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 5909d7332407a520d91bfd279cdb01e2e79fe74c..36a5b5b7cbac26ea1255143dc902c2a755710a22 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -61,7 +61,7 @@ sub disk_is_used {
     my $dev = $disk;
     $dev =~ s|^/dev/||;
 
-    my $disklist = get_disks($dev);
+    my $disklist = get_disks($dev, 1);
 
     die "'$disk' is not a valid local disk\n" if !defined($disklist->{$dev});
     return 1 if $disklist->{$dev}->{used};
@@ -74,31 +74,47 @@ sub get_smart_data {
 
     assert_blockdev($disk);
     my $smartdata = {};
-    my $datastarted = 0;
+    my $type;
 
     my $returncode = 0;
+
+    $disk =~ s/n\d+$//
+        if $disk =~ m!^/dev/nvme\d+n\d+$!;
+
     eval {
-       $returncode = run_command([$SMARTCTL, '-a', '-f', 'brief', $disk], noerr => 1, outfunc => sub{
+       $returncode = run_command([$SMARTCTL, '-H', '-A', '-f', 'brief', $disk], noerr => 1, outfunc => sub{
            my ($line) = @_;
 
-           if ($datastarted && $line =~ m/^[ \d]{2}\d/) {
-               $line = trim($line);
-               my @data = split /\s+/, $line;
+# ATA SMART attributes, e.g.:
+# ID# ATTRIBUTE_NAME          FLAGS    VALUE WORST THRESH FAIL RAW_VALUE
+#   1 Raw_Read_Error_Rate     POSR-K   100   100   000    -    0
+#
+# SAS and NVME disks, e.g.:
+# 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+(.*)$/) {
                my $entry = {};
-               $entry->{name} = $data[1];
-               $entry->{flags} = $data[2];
+               $entry->{name} = $2 if defined $2;
+               $entry->{flags} = $3 if defined $3;
                # the +0 makes a number out of the strings
-               $entry->{value} = $data[3] + 0;
-               $entry->{worst} = $data[4] + 0;
-               $entry->{threshold} = $data[5] + 0;
-               $entry->{fail} = $data[6];
-               $entry->{raw} = $data[7];
-               $entry->{id} = $data[0];
+               $entry->{value} = $4+0 if defined $4;
+               $entry->{worst} = $5+0 if defined $5;
+               $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;
                push @{$smartdata->{attributes}}, $entry;
-           } elsif ($line =~ m/self\-assessment test result: (.*)$/) {
+           } elsif ($line =~ m/(?:Health Status|self\-assessment test result): (.*)$/ ) {
                $smartdata->{health} = $1;
            } elsif ($line =~ m/Vendor Specific SMART Attributes with Thresholds:/) {
-               $datastarted = 1;
+               $type = 'ata';
+               delete $smartdata->{text};
+           } elsif ($line =~ m/=== START OF (READ )?SMART DATA SECTION ===/) {
+               $type = 'text';
+           } elsif (defined($type) && $type eq 'text') {
+               $smartdata->{text} = '' if !defined $smartdata->{text};
+               $smartdata->{text} .= "$line\n";
            }
        });
     };
@@ -110,6 +126,9 @@ sub get_smart_data {
     if ((defined($returncode) && ($returncode & 0b00000011)) || $err) {
        die "Error getting S.M.A.R.T. data: Exit code: $returncode\n";
     }
+
+    $smartdata->{type} = $type;
+
     return $smartdata;
 }
 
@@ -119,6 +138,8 @@ sub get_smart_health {
     return "NOT A DEVICE" if !assert_blockdev($disk, 1);
 
     my $message;
+    $disk =~ s/n\d+$//
+        if $disk =~ m!^/dev/nvme\d+n\d+$!;
 
     run_command([$SMARTCTL, '-H', $disk], noerr => 1, outfunc => sub {
        my ($line) = @_;
@@ -282,7 +303,7 @@ sub get_sysdir_info {
 }
 
 sub get_disks {
-    my ($disk) = @_;
+    my ($disk, $nosmart) = @_;
     my $disklist = {};
 
     my $mounted = {};
@@ -364,28 +385,30 @@ sub get_disks {
 
        my $health = 'UNKNOWN';
        my $wearout;
-       eval {
-           if ($type eq 'ssd' && !defined($disk)) {
-               # if we have an ssd we try to get the wearout indicator
-               $wearout = 'N/A';
-               my $smartdata = get_smart_data($devpath);
-               $health = $smartdata->{health};
-               foreach my $attr (@{$smartdata->{attributes}}) {
-                   # ID 233 is media wearout indicator on intel and sandisk
-                   # ID 177 is media wearout indicator on samsung
-                   next if ($attr->{id} != 233 && $attr->{id} != 177);
-                   next if ($attr->{name} !~ m/wear/i);
-                   $wearout = $attr->{value};
-
-                   # prefer the 233 value
-                   last if ($attr->{id} == 233);
+
+       if (!$nosmart) {
+           eval {
+               if ($type eq 'ssd') {
+                   # if we have an ssd we try to get the wearout indicator
+                   $wearout = 'N/A';
+                   my $smartdata = get_smart_data($devpath);
+                   $health = $smartdata->{health};
+                   foreach my $attr (@{$smartdata->{attributes}}) {
+                       # ID 233 is media wearout indicator on intel and sandisk
+                       # ID 177 is media wearout indicator on samsung
+                       next if ($attr->{id} != 233 && $attr->{id} != 177);
+                       next if ($attr->{name} !~ m/wear/i);
+                       $wearout = $attr->{value};
+
+                       # prefer the 233 value
+                       last if ($attr->{id} == 233);
+                   }
+               } else {
+                   # else we just get the health
+                   $health = get_smart_health($devpath);
                }
-           } elsif (!defined($disk)) {
-               # we do not need smart data if we check a single disk
-               # because this functionality is only for disk_is_used
-               $health = get_smart_health($devpath) if !defined($disk);
-           }
-       };
+           };
+       }
 
        my $used;