From 2c048efdaf2ac73c3a50edeaaf8280b2738a7f98 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Fri, 11 Dec 2020 14:52:41 +0100 Subject: [PATCH] Diskmanage: extend wearout detection for SAS disk for some controllers/disks there the line is Percentage used endurance indicator: x% so extend the regex for that possibilty. We even had a test-case for SAS but did not notice we could extract that info from there... Signed-off-by: Dominik Csapak --- PVE/Diskmanage.pm | 4 ++-- test/disk_tests/sas/sda_smart_expected.json | 3 ++- test/disk_tests/sas_ssd/disklist_expected.json | 2 +- test/disk_tests/sas_ssd/sda_smart_expected.json | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index a46cc73..116a99a 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -134,8 +134,8 @@ sub get_smart_data { } elsif (defined($type) && $type eq 'text') { $smartdata->{text} = '' if !defined $smartdata->{text}; $smartdata->{text} .= "$line\n"; - # extract wearout from nvme text, allow for decimal values - if ($line =~ m/Percentage Used:\s*(\d+(?:\.\d+)?)\%/i) { + # extract wearout from nvme/sas text, allow for decimal values + if ($line =~ m/Percentage Used(?: endurance indicator)?:\s*(\d+(?:\.\d+)?)\%/i) { $smartdata->{wearout} = 100 - $1; } } elsif ($line =~ m/SMART Disabled/) { diff --git a/test/disk_tests/sas/sda_smart_expected.json b/test/disk_tests/sas/sda_smart_expected.json index e096c8b..2964372 100644 --- a/test/disk_tests/sas/sda_smart_expected.json +++ b/test/disk_tests/sas/sda_smart_expected.json @@ -1,5 +1,6 @@ { "health" : "OK", "text" : "\nPercentage used endurance indicator: 0%\nCurrent Drive Temperature: 20 C\nDrive Trip Temperature: 70 C\n\nManufactured in week 47 of year 2012\nSpecified cycle count over device lifetime: 0\nAccumulated start-stop cycles: 0\nSpecified load-unload count over device lifetime: 0\nAccumulated load-unload cycles: 0\nElements in grown defect list: 0\n\nVendor (Seagate) cache information\n Blocks sent to initiator = 1286675833552896\n\nVendor (Seagate/Hitachi) factory information\n number of hours powered up = 7127.12\n number of minutes until next internal SMART test = 0\n", - "type" : "text" + "type" : "text", + "wearout": 100 } diff --git a/test/disk_tests/sas_ssd/disklist_expected.json b/test/disk_tests/sas_ssd/disklist_expected.json index 9e7ada3..dd9b748 100644 --- a/test/disk_tests/sas_ssd/disklist_expected.json +++ b/test/disk_tests/sas_ssd/disklist_expected.json @@ -11,7 +11,7 @@ "rpm" : 0, "size" : 5120000, "serial" : "SER2", - "wearout" : "N/A", + "wearout" : 100, "by_id_link" : "/dev/disk/by-id/scsi-00000000000000000" } } diff --git a/test/disk_tests/sas_ssd/sda_smart_expected.json b/test/disk_tests/sas_ssd/sda_smart_expected.json index e096c8b..2964372 100644 --- a/test/disk_tests/sas_ssd/sda_smart_expected.json +++ b/test/disk_tests/sas_ssd/sda_smart_expected.json @@ -1,5 +1,6 @@ { "health" : "OK", "text" : "\nPercentage used endurance indicator: 0%\nCurrent Drive Temperature: 20 C\nDrive Trip Temperature: 70 C\n\nManufactured in week 47 of year 2012\nSpecified cycle count over device lifetime: 0\nAccumulated start-stop cycles: 0\nSpecified load-unload count over device lifetime: 0\nAccumulated load-unload cycles: 0\nElements in grown defect list: 0\n\nVendor (Seagate) cache information\n Blocks sent to initiator = 1286675833552896\n\nVendor (Seagate/Hitachi) factory information\n number of hours powered up = 7127.12\n number of minutes until next internal SMART test = 0\n", - "type" : "text" + "type" : "text", + "wearout": 100 } -- 2.39.2