2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Ensure SMART timeout message is in the report

Browse source
This commit is contained in:
2Shirt 2018-12-18 15:47:03 -07:00
parent 7ac035c578
commit 91a77bb14e
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.bin/Scripts/functions/hw_diags.py
View file

@ -132,6 +132,7 @@ class DiskObj():
self.nvme_attributes = {} self.nvme_attributes = {}
self.path = disk_path self.path = disk_path
self.smart_attributes = {} self.smart_attributes = {}
self.smart_timeout = False
self.smart_self_test = {} self.smart_self_test = {}
self.smartctl = {} self.smartctl = {}
self.tests = OrderedDict() self.tests = OrderedDict()
@ -331,12 +332,11 @@ class DiskObj():
# SMART short-test # SMART short-test
if short_test: if short_test:
report.append('{BLUE}SMART Short self-test{CLEAR}'.format(**COLORS)) report.append('{BLUE}SMART Short self-test{CLEAR}'.format(**COLORS))
if 'TimedOut' in self.tests['NVMe / SMART'].status: report.append(' {}'.format(
report.append(' {YELLOW}UNKNOWN{CLEAR}: Timed out'.format(**COLORS)) self.smart_self_test['status'].get(
else: 'string', 'UNKNOWN').capitalize()))
report.append(' {}'.format( if self.smart_timeout:
self.smart_self_test['status'].get( report.append(' {YELLOW}Timed out{CLEAR}'.format(**COLORS))
'string', 'UNKNOWN').capitalize()))
# Done # Done
return report return report
@ -1443,6 +1443,7 @@ def run_nvme_smart_tests(state, test):
test.timeout = int(test.timeout) + 5 test.timeout = int(test.timeout) + 5
_include_short_test = True _include_short_test = True
_self_test_started = False _self_test_started = False
_self_test_finished = False
# Create monitor pane # Create monitor pane
test.smart_out = '{}/smart_{}.out'.format( test.smart_out = '{}/smart_{}.out'.format(
@ -1488,6 +1489,7 @@ def run_nvme_smart_tests(state, test):
# Check if test has finished # Check if test has finished
if 'remaining_percent' not in test.dev.smart_self_test['status']: if 'remaining_percent' not in test.dev.smart_self_test['status']:
_self_test_finished = True
break break
else: else:
@ -1505,15 +1507,16 @@ def run_nvme_smart_tests(state, test):
raise GenericAbort('Aborted') raise GenericAbort('Aborted')
# Check if timed out # Check if timed out
if 'passed' in test.dev.smart_self_test['status']: if _self_test_finished:
if test.dev.smart_self_test['status']['passed']: if test.dev.smart_self_test['status'].get('passed', False):
if 'OVERRIDE' not in test.status: if 'OVERRIDE' not in test.status:
test.passed = True test.passed = True
test.update_status('CS') test.update_status('CS')
else: else:
test.failed = True test.failed = True
test.update_status('NS') test.update_status('NS')
if not (test.failed or test.passed): else:
test.dev.smart_timeout = True
test.update_status('TimedOut') test.update_status('TimedOut')
# Disable other drive tests if necessary # Disable other drive tests if necessary