tyler.durden
/
hwraid
mirror of https://github.com/eLvErDe/hwraid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle not array attached disk properly (i hope so)

This commit is contained in:
Adam Cecile 2016-09-23 11:54:23 +02:00
parent c19d41d276
commit 29b2068bf1
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wrapper-scripts/aacraid-status Executable file → Normal file
View File

@ -268,31 +268,44 @@ while controllerid <= controllernumber:
cmd = '"%s" GETCONFIG %s' % (arcconfpath, controllerid) cmd = '"%s" GETCONFIG %s' % (arcconfpath, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
arrayids = returnArrayIds(output) arrayids = returnArrayIds(output)
for arrayid in arrayids:
cmd = '"%s" GETCONFIG %s LD %s' % (arcconfpath, controllerid, arrayid)
output = getOutput(cmd)
arrayinfo = returnArrayInfo(output)
cmd = '"%s" GETCONFIG %d PD' % (arcconfpath, controllerid) cmd = '"%s" GETCONFIG %d PD' % (arcconfpath, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
diskinfo = returnDisksInfo(output,controllerid) diskinfo = returnDisksInfo(output,controllerid)
for member in arrayinfo[3]: no_array_disk_id = 0
i = 0
for disk in diskinfo: for disk in diskinfo:
# Generic verification no matter is the disk is member of an array or not
if disk[1] != 'Online' and disk[1] != 'Hot Spare' and disk[1] != 'Ready' and disk[1] != 'Global Hot-Spare': if disk[1] != 'Online' and disk[1] != 'Hot Spare' and disk[1] != 'Ready' and disk[1] != 'Global Hot-Spare':
bad = True bad = True
nagiosbaddisk += 1 nagiosbaddisk += 1
else: else:
nagiosgooddisk += 1 nagiosgooddisk += 1
array_member = False
for arrayid in arrayids:
cmd = '"%s" GETCONFIG %s LD %s' % (arcconfpath, controllerid, arrayid)
output = getOutput(cmd)
arrayinfo = returnArrayInfo(output)
# Try to attach current disk to array (loop)
memberid = 0
for member in arrayinfo[3]:
# Matched in members of this array
if disk[0] == member: if disk[0] == member:
if not config.nagios: if not config.nagios:
print 'c'+str(controllerid-1)+'u'+str(arrayid)+'d'+str(i)+' | '+disk[2]+' '+disk[3]+' | '+disk[1] print 'c'+str(controllerid-1)+'u'+str(arrayid)+'d'+str(memberid)+' | '+disk[2]+' '+disk[3]+' | '+disk[1]
# Some disks may not be attached to an array (ie: global hot spare) array_member = True
else: memberid += 1
# Some disks may not be attached to any array (ie: global hot spare)
if not array_member:
if not config.nagios: if not config.nagios:
print 'c'+str(controllerid-1)+'uX'+'d'+str(i)+' | '+disk[2]+' '+disk[3]+' | '+disk[1] print 'c'+str(controllerid-1)+'uX'+'d'+str(no_array_disk_id)+' | '+disk[2]+' '+disk[3]+' | '+disk[1]
i += 1 no_array_disk_id += 1
controllerid += 1 controllerid += 1
if config.nagios: if config.nagios: