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

Very minor bugfixes (Rev 1.45)

Browse Source
This commit is contained in:
Vincent S. Cojot 2015-04-17 02:40:54 -04:00
parent fabae64392
commit 5c1f9d68f4
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wrapper-scripts/megaclisas-status
View File

@ -1,5 +1,5 @@
#!/usr/bin/python #!/usr/bin/python
# $Id: megaclisas-status,v 1.44 2015/04/17 01:59:31 root Exp $ # $Id: megaclisas-status,v 1.45 2015/04/17 02:40:54 root Exp $
# #
# Written by Adam Cecile <gandalf@NOSPAM.le-vert.net> # Written by Adam Cecile <gandalf@NOSPAM.le-vert.net>
# Modified vy Vincent S. Cojot <vincent@NOSPAM.cojot.name> # Modified vy Vincent S. Cojot <vincent@NOSPAM.cojot.name>
@ -190,8 +190,9 @@ def returnPCIInfo(output):
if re.match(r'^Device Number.*:.*$',line.strip()): if re.match(r'^Device Number.*:.*$',line.strip()):
devid = str(line.strip().split(':')[1].strip()).zfill(2) devid = str(line.strip().split(':')[1].strip()).zfill(2)
if re.match(r'^Function Number.*:.*$',line.strip()): if re.match(r'^Function Number.*:.*$',line.strip()):
functionid = str(line.strip().split(':')[1].strip()).zfill(2) functionid = str(line.strip().split(':')[1].strip()).zfill(1)
pcipath = str(busprefix + ':' + busid + ':' + devid + '.' + functionid) pcipath = str(busprefix + ':' + busid + ':' + devid + '.' + functionid)
dbgprint("Array PCI path : "+pcipath)
return str(pcipath) return str(pcipath)
def returnHBAInfo(table,output,controllerid): def returnHBAInfo(table,output,controllerid):
@ -210,6 +211,7 @@ def returnArrayInfo(output,controllerid,arrayid):
id = 'c'+str(controllerid)+'u'+str(arrayid) id = 'c'+str(controllerid)+'u'+str(arrayid)
operationlinennumber = False operationlinennumber = False
linenumber = 0 linenumber = 0
targetid = ''
raidtype = '' raidtype = ''
size = '' size = ''
state = '' state = ''
@ -218,6 +220,9 @@ def returnArrayInfo(output,controllerid,arrayid):
properties = '' properties = ''
spandepth = 0 spandepth = 0
for line in output: for line in output:
if re.match(r'^Virtual Drive:.*(Target Id: [0-9]+).*$',line.strip()):
# Extract the SCSI Target ID
targetid = line.strip().split(':')[2].split(')')[0].strip()
if re.match(r'^RAID Level.*?:.*$',line.strip()): if re.match(r'^RAID Level.*?:.*$',line.strip()):
# Extract the primary raid type, decide on X0 RAID level later when we hit Span Depth # Extract the primary raid type, decide on X0 RAID level later when we hit Span Depth
raidtype = 'RAID-'+line.strip().split(':')[1].split(',')[0].split('-')[1].strip() raidtype = 'RAID-'+line.strip().split(':')[1].split(',')[0].split('-')[1].strip()
@ -270,7 +275,7 @@ def returnArrayInfo(output,controllerid,arrayid):
inprogress = output[operationlinennumber+1] inprogress = output[operationlinennumber+1]
else: else:
inprogress = 'None' inprogress = 'None'
return [id,raidtype,size,strpsz,properties,dskcache,state,inprogress] return [id,raidtype,size,strpsz,properties,dskcache,state,targetid,inprogress]
def returnDiskInfo(output,controllerid): def returnDiskInfo(output,controllerid):
arrayid = False arrayid = False
@ -466,9 +471,6 @@ if printarray:
rlen = 0 rlen = 0
while controllerid < controllernumber: while controllerid < controllernumber:
arrayid = 0 arrayid = 0
cmd = '%s -AdpGetPciInfo -a%d -NoLog' % (megaclipath, controllerid)
output = getOutput(cmd)
pcipath = returnPCIInfo(output)
cmd = '%s -LDInfo -lall -a%d -NoLog' % (megaclipath, controllerid) cmd = '%s -LDInfo -lall -a%d -NoLog' % (megaclipath, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
@ -482,7 +484,7 @@ if printarray:
if re.match(r'^Adapter.*Virtual Drive .* Does not Exist',line.strip()): if re.match(r'^Adapter.*Virtual Drive .* Does not Exist',line.strip()):
ldid += 1 ldid += 1
if re.match(r'^Virtual Drive:',line.strip()): if re.match(r'^Virtual Drive:',line.strip()):
LDTable[controllerid].append (ldid ) LDTable[controllerid].append ( ldid )
ldcount += 1 ldcount += 1
ldid += 1 ldid += 1
@ -501,6 +503,11 @@ if printarray:
controllerid = 0 controllerid = 0
while controllerid < controllernumber: while controllerid < controllernumber:
arrayid = 0 arrayid = 0
cmd = '%s -AdpGetPciInfo -a%d -NoLog' % (megaclipath, controllerid)
output = getOutput(cmd)
pcipath = returnPCIInfo(output)
cmd = '%s -LDInfo -lall -a%d -NoLog' % (megaclipath, controllerid) cmd = '%s -LDInfo -lall -a%d -NoLog' % (megaclipath, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
arraynumber = returnArrayNumber(output) arraynumber = returnArrayNumber(output)
@ -509,11 +516,12 @@ if printarray:
cmd = '%s -LDInfo -l%d -a%d -NoLog' % (megaclipath, ldid, controllerid) cmd = '%s -LDInfo -l%d -a%d -NoLog' % (megaclipath, ldid, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
arrayinfo = returnArrayInfo(output,controllerid, ldid) arrayinfo = returnArrayInfo(output,controllerid, ldid)
ldfmt = str('%-5s | %-'+str(rlen)+'s | %7s | %7s | %'+str(mlen)+'s | %8s | %-7s | %-12s ')
ldfmt = str('%-5s | %-'+str(rlen)+'s | %7s | %7s | %'+str(mlen)+'s | %8s | %-7s | %-8s | %-12s ')
# Header # Header
if ( i == 0 ): if ( i == 0 ):
if not nagiosmode: if not nagiosmode:
print ldfmt % ("-- ID", "Type", "Size", "Strpsz", "Flags", "DskCache", "Status", "InProgress" ) print ldfmt % ("-- ID", "Type", "Size", "Strpsz", "Flags", "DskCache", "Status", "OS Path", "InProgress" )
if not nagiosmode: if not nagiosmode:
print ldfmt % ( print ldfmt % (
arrayinfo[0], arrayinfo[0],
@ -523,7 +531,8 @@ if printarray:
arrayinfo[4], arrayinfo[4],
arrayinfo[5], arrayinfo[5],
arrayinfo[6], arrayinfo[6],
arrayinfo[7]) arrayinfo[7],
arrayinfo[8])
dbgprint("Array state : "+arrayinfo[6]) dbgprint("Array state : "+arrayinfo[6])
if not arrayinfo[6] == 'Optimal': if not arrayinfo[6] == 'Optimal':
bad = True bad = True
@ -578,11 +587,13 @@ if totaldrivenumber:
controllerid = 0 controllerid = 0
while controllerid < controllernumber: while controllerid < controllernumber:
arrayid = 0 arrayid = 0
cmd = '%s -LDInfo -lall -a%d -NoLog' % (megaclipath, controllerid) cmd = '%s -LDInfo -lall -a%d -NoLog' % (megaclipath, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
arraynumber = returnArrayNumber(output) arraynumber = returnArrayNumber(output)
#### BUG: -LdPdInfo shows all PD on the adapter, not just for said LD.. #### BUG: -LdPdInfo shows all PD on the adapter, not just for said LD..
#### while arrayid <= arraynumber: #### while arrayid <= arraynumber:
cmd = '%s -LdPdInfo -a%d -NoLog' % (megaclipath, controllerid) cmd = '%s -LdPdInfo -a%d -NoLog' % (megaclipath, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
arraydisk = returnDiskInfo(output,controllerid) arraydisk = returnDiskInfo(output,controllerid)
@ -626,11 +637,13 @@ if totalunconfdrivenumber:
controllerid = 0 controllerid = 0
while controllerid < controllernumber: while controllerid < controllernumber:
arrayid = 0 arrayid = 0
cmd = '%s -LDInfo -lall -a%d -NoLog' % (megaclipath, controllerid) cmd = '%s -LDInfo -lall -a%d -NoLog' % (megaclipath, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
arraynumber = returnArrayNumber(output) arraynumber = returnArrayNumber(output)
#### BUG: -LdPdInfo shows all PD on the adapter, not just for said LD.. #### BUG: -LdPdInfo shows all PD on the adapter, not just for said LD..
#### while arrayid <= arraynumber: #### while arrayid <= arraynumber:
cmd = '%s -PDList -a%d -NoLog' % (megaclipath, controllerid) cmd = '%s -PDList -a%d -NoLog' % (megaclipath, controllerid)
output = getOutput(cmd) output = getOutput(cmd)
arraydisk = returnUnconfDiskInfo(output,controllerid) arraydisk = returnUnconfDiskInfo(output,controllerid)