Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402023 )
Change subject: smart: bump timeout to 60s
......................................................................
smart: bump timeout to 60s
In cases with many (and some broken) disks it can take longer that 30s to
finish running commands.
Bug: T86552
Change-Id: I35d24ae89b87a9ca47a1a0399dab837ef6e7c987
---
M modules/smart/files/smart-data-dump
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/smart/files/smart-data-dump
b/modules/smart/files/smart-data-dump
index 683b2bc..372e444 100644
--- a/modules/smart/files/smart-data-dump
+++ b/modules/smart/files/smart-data-dump
@@ -82,7 +82,7 @@
def megaraid_list_pd():
"""List physical disks attached to megaraid controller. Generator to yield
PD objects."""
- raw_output = subprocess.check_output(['/usr/bin/timeout', '30',
'/usr/sbin/smartctl',
+ raw_output = subprocess.check_output(['/usr/bin/timeout', '60',
'/usr/sbin/smartctl',
'--scan-open'])
for line in raw_output.splitlines():
line = str(line, 'utf8')
@@ -98,7 +98,7 @@
def hpsa_list_pd():
"""List physical disks attached to hpsa controller. Generator to yield PD
objects."""
- raw_output = subprocess.check_output(['/usr/bin/timeout', '30',
'/usr/sbin/hpssacli',
+ raw_output = subprocess.check_output(['/usr/bin/timeout', '60',
'/usr/sbin/hpssacli',
'controller', 'all', 'show',
'config'])
in_controller = False
for line in raw_output.splitlines():
@@ -121,7 +121,7 @@
"""List all physical disks. Generator to yield PD objects."""
# starting with stretch, lsblk has --json but not on trusty/jessie
- raw_output = subprocess.check_output(['/usr/bin/timeout', '30',
'/bin/lsblk', '--noheadings',
+ raw_output = subprocess.check_output(['/usr/bin/timeout', '60',
'/bin/lsblk', '--noheadings',
'--output', 'NAME,TYPE', '--raw'])
for line in raw_output.splitlines():
line = str(line, 'utf8')
@@ -132,7 +132,7 @@
disk_id=name)
-def _run_smartctl(args, timeout=30):
+def _run_smartctl(args, timeout=60):
try:
cmd_args = ['/usr/bin/timeout', str(timeout), '/usr/sbin/smartctl']
cmd_args.extend(args)
--
To view, visit https://gerrit.wikimedia.org/r/402023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35d24ae89b87a9ca47a1a0399dab837ef6e7c987
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
