yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge get_smart_data/health

Browse Source 
instead of parsing the output of smart in two places,
give get_smart_data a flag if we only want health

this fixes a bug (not on the bugtracker), where
an ssd with disabled smart had an empty string as health
in the gui

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2016-10-05 10:57:09 +02:00
committed by Dietmar Maurer
parent daa623edc3
commit dd902da78e
2 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PVE/API2/Disks.pm
View File

@ -140,13 +140,10 @@ __PACKAGE__->register_method ({
my $result = {}; my $result = {};
if ($param->{healthonly}) { my $result = PVE::Diskmanage::get_smart_data($disk, $param->{healthonly});
$result = { health => PVE::Diskmanage::get_smart_health($disk) };
} else {
$result = PVE::Diskmanage::get_smart_data($disk);
}
$result->{health} = 'UNKNOWN' if !defined $result->{health}; $result->{health} = 'UNKNOWN' if !defined $result->{health};
$result = { health => $result->{health} } if $param->{healthonly};
return $result; return $result;
}}); }});

42
PVE/Diskmanage.pm
View File

@ -70,7 +70,7 @@ sub disk_is_used {
} }
sub get_smart_data { sub get_smart_data {
my ($disk) = @_; my ($disk, $healthonly) = @_;
assert_blockdev($disk); assert_blockdev($disk);
my $smartdata = {}; my $smartdata = {};
@ -81,8 +81,12 @@ sub get_smart_data {
$disk =~ s/n\d+$// $disk =~ s/n\d+$//
if $disk =~ m!^/dev/nvme\d+n\d+$!; if $disk =~ m!^/dev/nvme\d+n\d+$!;
my $cmd = [$SMARTCTL, '-H'];
push @$cmd, '-A', '-f', 'brief' if !$healthonly;
push @$cmd, $disk;
eval { eval {
$returncode = run_command([$SMARTCTL, '-H', '-A', '-f', 'brief', $disk], noerr => 1, outfunc => sub{ $returncode = run_command($cmd, noerr => 1, outfunc => sub{
my ($line) = @_; my ($line) = @_;
# ATA SMART attributes, e.g.: # ATA SMART attributes, e.g.:
@ -115,6 +119,8 @@ sub get_smart_data {
} elsif (defined($type) && $type eq 'text') { } elsif (defined($type) && $type eq 'text') {
$smartdata->{text} = '' if !defined $smartdata->{text}; $smartdata->{text} = '' if !defined $smartdata->{text};
$smartdata->{text} .= "$line\n"; $smartdata->{text} .= "$line\n";
} elsif ($line =~ m/SMART Disabled/) {
$smartdata->{health} = "SMART Disabled";
} }
}); });
}; };
@ -132,30 +138,6 @@ sub get_smart_data {
return $smartdata; return $smartdata;
} }
sub get_smart_health {
my ($disk) = @_;
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) = @_;
if ($line =~ m/test result: (.*)$/) {
$message = $1;
} elsif ($line =~ m/open device: (.*) failed: (.*)$/) {
$message = "FAILED TO OPEN";
} elsif ($line =~ m/^SMART Disabled/) {
$message = "SMART DISABLED";
}
});
return $message;
}
sub get_zfs_devices { sub get_zfs_devices {
my $list = {}; my $list = {};
@ -388,11 +370,12 @@ sub get_disks {
if (!$nosmart) { if (!$nosmart) {
eval { eval {
my $smartdata = get_smart_data($devpath, ($type ne 'ssd'));
$health = $smartdata->{health} if $smartdata->{health};
if ($type eq 'ssd') { if ($type eq 'ssd') {
# if we have an ssd we try to get the wearout indicator # if we have an ssd we try to get the wearout indicator
$wearout = 'N/A'; $wearout = 'N/A';
my $smartdata = get_smart_data($devpath);
$health = $smartdata->{health};
foreach my $attr (@{$smartdata->{attributes}}) { foreach my $attr (@{$smartdata->{attributes}}) {
# ID 233 is media wearout indicator on intel and sandisk # ID 233 is media wearout indicator on intel and sandisk
# ID 177 is media wearout indicator on samsung # ID 177 is media wearout indicator on samsung
@ -403,9 +386,6 @@ sub get_disks {
# prefer the 233 value # prefer the 233 value
last if ($attr->{id} == 233); last if ($attr->{id} == 233);
} }
} else {
# else we just get the health
$health = get_smart_health($devpath);
} }
}; };
} }