fix #1099 (again): map cciss/c0d0 to cciss!c0d0

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

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index dd2591c70d8e32c434f9f7c25792fcb6b806d632..6dd12f7321b82a4986165c1c24942ea1f5ee5376 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -5,6 +5,7 @@ use warnings;
 use PVE::ProcFSTools;
 use Data::Dumper;
 use Cwd qw(abs_path);
+use Fcntl ':mode';
 
 use PVE::Tools qw(extract_param run_command file_get_contents file_read_firstline dir_glob_regex dir_glob_foreach trim);
 
@@ -97,14 +98,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;
@@ -255,6 +263,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;
@@ -278,7 +290,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';
@@ -296,6 +308,7 @@ sub get_wear_leveling_info {
        'samsung' => 177,
        'intel' => 233,
        'sandisk' => 233,
+       'crucial' => 202,
        'default' => 233,
     };
 
@@ -324,6 +337,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 = {};
@@ -342,27 +370,17 @@ 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();
 
     my $lvmlist = get_lvm_devices();
 
+    # we get cciss/c0d0 but need cciss!c0d0
+    if (defined($disk) && $disk =~ m|^cciss/|) {
+       $disk =~ s|cciss/|cciss!|;
+    }
+
     dir_glob_foreach('/sys/block', '.*', sub {
        my ($dev) = @_;
        return if defined($disk) && $disk ne $dev;
@@ -413,7 +431,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 +447,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 +497,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 +511,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;
@@ -504,4 +522,47 @@ sub get_disks {
 
 }
 
+sub get_partnum {
+    my ($part_path) = @_;
+
+    my ($mode, $rdev) = (stat($part_path))[2,6];
+
+    next if !$mode || !S_ISBLK($mode) || !$rdev;
+    my $major = int($rdev / 0x100);
+    my $minor = $rdev % 0x100;
+    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);
+
+    #untaint and ensure it is a int
+    if ($partnum =~ m/(\d+)/) {
+       $partnum = $1;
+       die "Partition number $partnum is invalid\n" if $partnum > 128;
+    } else {
+       die "Failed to get partition number\n";
+    }
+
+    return $partnum;
+}
+
+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$|;
+
+    die "Can't parse parent device\n" if !defined($block_dev);
+    die "No valid block device\n" if index($dev, $block_dev) == -1;
+
+    $block_dev = "/dev/$block_dev";
+    die "Block device does not exsists\n" if !(-b $block_dev);
+
+    return $block_dev;
+}
+
 1;