tyler.durden/hwraid
1
0
Fork 0
mirror of https://github.com/eLvErDe/hwraid.git synced 2025-07-25 06:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from bfloriang/master

Browse Source 
[sas2ircu-status] cache sas2ircu calls to speed up execution in case of multiple controllers
This commit is contained in:
Adam Cécile 2015-10-13 22:48:37 +02:00
commit 5426c2b88a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wrapper-scripts/sas2ircu-status
View File

@ -5,6 +5,9 @@ import re
import sys import sys
binarypath = "/usr/sbin/sas2ircu" binarypath = "/usr/sbin/sas2ircu"
if not os.path.isfile(binarypath):
print 'sas2ircu is not available in expected location: {}'.format(binarypath)
sys.exit(1)
if len(sys.argv) > 2: if len(sys.argv) > 2:
print 'Usage: sas2ircu-status [--nagios]' print 'Usage: sas2ircu-status [--nagios]'
@ -116,19 +119,21 @@ def getDiskList(ctrlnmbr):
list.append([diskid,diskstatus,diskmodel,diskserial,realid]) list.append([diskid,diskstatus,diskmodel,diskserial,realid])
return list return list
ctrls=getCtrlList()
arraymap={}
if not nagiosmode: if not nagiosmode:
print '-- Controller informations --' print '-- Controller informations --'
print '-- ID | Model' print '-- ID | Model'
for ctrl in getCtrlList(): for ctrl in ctrls:
print 'c'+str(ctrl[0])+' | '+ctrl[1] print 'c'+str(ctrl[0])+' | '+ctrl[1]
print '' print ''
if not nagiosmode: if not nagiosmode:
print '-- Arrays informations --' print '-- Arrays informations --'
print '-- ID | Type | Size | Status' print '-- ID | Type | Size | Status'
for ctrl in getCtrlList(): for ctrl in ctrls:
for array in getArrayList(ctrl[0]): for array in getArrayList(ctrl[0]):
arraymap[ctrl[0]]=array
if not array[3] in ['Okay (OKY)', 'Inactive, Okay (OKY)']: if not array[3] in ['Okay (OKY)', 'Inactive, Okay (OKY)']:
bad=True bad=True
nagiosbadarray=nagiosbadarray+1 nagiosbadarray=nagiosbadarray+1
@ -142,10 +147,10 @@ if not nagiosmode:
if not nagiosmode: if not nagiosmode:
print '-- Disks informations' print '-- Disks informations'
print '-- ID | Model | Status' print '-- ID | Model | Status'
for ctrl in getCtrlList(): for ctrl in ctrls:
for disk in getDiskList(ctrl[0]): for disk in getDiskList(ctrl[0]):
# Compare disk enc/slot to array's ones # Compare disk enc/slot to array's ones
for array in getArrayList(ctrl[0]): for array in [arraymap.get(ctrl[0])]:
for arraydisk in array[4]: for arraydisk in array[4]:
if arraydisk == disk[4]: if arraydisk == disk[4]:
if not disk[1] == 'Optimal (OPT)': if not disk[1] == 'Optimal (OPT)':