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

Diskmanage: extract nvme wearout from smartctl text

Browse Source 
extract the info from the line:
Percentage Used: XX%

also adapt the tests

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2019-06-04 13:05:27 +02:00
committed by Thomas Lamprecht
parent d0a217f624
commit ea928fd41a
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/Diskmanage.pm
View File

@ -131,6 +131,10 @@ 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";
# extract wearout from nvme text, allow for decimal values
if ($line =~ m/Percentage Used:.*(\d+(?:\.\d+)?)\%/i) {
$smartdata->{wearout} = 100 - $1;
}
} elsif ($line =~ m/SMART Disabled/) { } elsif ($line =~ m/SMART Disabled/) {
$smartdata->{health} = "SMART Disabled"; $smartdata->{health} = "SMART Disabled";
} }
@ -352,7 +356,12 @@ sub get_sysdir_info {
} }
sub get_wear_leveling_info { sub get_wear_leveling_info {
my ($attributes, $model) = @_; my ($smartdata, $model) = @_;
my $attributes = $smartdata->{attributes};
if (defined($smartdata->{wearout})) {
return $smartdata->{wearout};
}
my $wearout; my $wearout;
@ -502,7 +511,7 @@ sub get_disks {
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
my $wearval = get_wear_leveling_info($smartdata->{attributes}, $data->{model} || $sysdir->{model}); my $wearval = get_wear_leveling_info($smartdata, $data->{model} || $sysdir->{model});
$wearout = $wearval if $wearval; $wearout = $wearval if $wearval;
} }
}; };

2
test/disk_tests/nvme_smart/disklist_expected.json
View File

@ -1,6 +1,6 @@
{ {
"nvme0n1" : { "nvme0n1" : {
"wearout" : "N/A", "wearout" : 100,
"vendor" : "unknown", "vendor" : "unknown",
"size" : 512000, "size" : 512000,
"health" : "PASSED", "health" : "PASSED",

3
test/disk_tests/nvme_smart/nvme0n1_smart_expected.json
View File

@ -1,5 +1,6 @@
{ {
"text" : "\nSMART/Health Information (NVMe Log 0x02, NSID 0xffffffff)\nCritical Warning: 0x00\nTemperature: 32 Celsius\nAvailable Spare: 100%\nAvailable Spare Threshold: 10%\nPercentage Used: 0%\nData Units Read: 1,299,288 [665 GB]\nData Units Written: 5,592,478 [2.86 TB]\nHost Read Commands: 30,360,807\nHost Write Commands: 470,356,196\nController Busy Time: 12\nPower Cycles: 98\nPower On Hours: 687\nUnsafe Shutdowns: 21\nMedia and Data Integrity Errors: 0\nError Information Log Entries: 0\n", "text" : "\nSMART/Health Information (NVMe Log 0x02, NSID 0xffffffff)\nCritical Warning: 0x00\nTemperature: 32 Celsius\nAvailable Spare: 100%\nAvailable Spare Threshold: 10%\nPercentage Used: 0%\nData Units Read: 1,299,288 [665 GB]\nData Units Written: 5,592,478 [2.86 TB]\nHost Read Commands: 30,360,807\nHost Write Commands: 470,356,196\nController Busy Time: 12\nPower Cycles: 98\nPower On Hours: 687\nUnsafe Shutdowns: 21\nMedia and Data Integrity Errors: 0\nError Information Log Entries: 0\n",
"health" : "PASSED", "health" : "PASSED",
"type" : "text" "type" : "text",
"wearout": 100
} }