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

move SMART error handling into get_disks

Browse Source 
because we never ever want to die in get_disks because of a
single disk, but the nodes/xyz/disks/smart API path is
allowed to fail if a disk device is unsupported by smartctl
or something else goes wrong.
This commit is contained in:
Fabian Grünbichler
2016-09-28 13:42:22 +02:00
committed by Dietmar Maurer
parent d547f26c7d
commit acd3d91649
2 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Disks.pm
View File

@ -138,6 +138,8 @@ __PACKAGE__->register_method ({
$result = PVE::Diskmanage::get_smart_data($disk); $result = PVE::Diskmanage::get_smart_data($disk);
} }
$result->{health} = 'UNKOWN' if !defined $result->{health};
return $result; return $result;
}}); }});

13
PVE/Diskmanage.pm
View File

@ -110,7 +110,6 @@ sub get_smart_data {
if ((defined($returncode) && ($returncode & 0b00000011)) || $err) { if ((defined($returncode) && ($returncode & 0b00000011)) || $err) {
die "Error getting S.M.A.R.T. data: Exit code: $returncode\n"; die "Error getting S.M.A.R.T. data: Exit code: $returncode\n";
} }
$smartdata->{health} = 'UNKOWN' if !defined $smartdata->{health};
return $smartdata; return $smartdata;
} }
@ -119,9 +118,8 @@ sub get_smart_health {
return "NOT A DEVICE" if !assert_blockdev($disk, 1); return "NOT A DEVICE" if !assert_blockdev($disk, 1);
my $message = "UNKOWN"; my $message;
eval {
run_command([$SMARTCTL, '-H', $disk], noerr => 1, outfunc => sub { run_command([$SMARTCTL, '-H', $disk], noerr => 1, outfunc => sub {
my ($line) = @_; my ($line) = @_;
@ -133,8 +131,6 @@ sub get_smart_health {
$message = "SMART DISABLED"; $message = "SMART DISABLED";
} }
}); });
};
# we ignore errors here because by default we want to return UNKNOWN
return $message; return $message;
} }
@ -366,10 +362,12 @@ sub get_disks {
} }
} }
my $health; my $health = 'UNKNOWN';
my $wearout; my $wearout;
eval {
if ($type eq 'ssd' && !defined($disk)) { if ($type eq 'ssd' && !defined($disk)) {
# 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';
my $smartdata = get_smart_data($devpath); my $smartdata = get_smart_data($devpath);
$health = $smartdata->{health}; $health = $smartdata->{health};
foreach my $attr (@{$smartdata->{attributes}}) { foreach my $attr (@{$smartdata->{attributes}}) {
@ -382,13 +380,12 @@ sub get_disks {
# prefer the 233 value # prefer the 233 value
last if ($attr->{id} == 233); last if ($attr->{id} == 233);
} }
$wearout = 'N/A' if !defined($wearout);
} elsif (!defined($disk)) { } elsif (!defined($disk)) {
# we do not need smart data if we check a single disk # we do not need smart data if we check a single disk
# because this functionality is only for disk_is_used # because this functionality is only for disk_is_used
$health = get_smart_health($devpath) if !defined($disk); $health = get_smart_health($devpath) if !defined($disk);
} }
};
my $used; my $used;