From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EF0E86B6E6 for ; Fri, 11 Dec 2020 14:52:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E3C8820B7A for ; Fri, 11 Dec 2020 14:52:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6928A20B67 for ; Fri, 11 Dec 2020 14:52:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 33A5F44ECB for ; Fri, 11 Dec 2020 14:52:42 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 11 Dec 2020 14:52:41 +0100 Message-Id: <20201211135241.27957-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201211135241.27957-1-d.csapak@proxmox.com> References: <20201211135241.27957-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.286 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [diskmanage.pm] Subject: [pve-devel] [PATCH storage 2/2] Diskmanage: extend wearout detection for SAS disk X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 13:52:44 -0000 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.20.1