xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-23 16:13:47 +00:00
Code Issues Projects Releases Wiki Activity

Make indirect PDU operations concurrent

Browse Source 
Similar to the enclosure reseat work, have indirect
PDU operations be made concurrent across PDUs, though
still serial within a PDU.
This commit is contained in:
Jarrod Johnson 2024-02-02 10:35:47 -05:00
parent 59a31d38a2
commit 3a0172cccc
2 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
confluent_server/confluent/plugins/hardwaremanagement/enclosure.py
View File

@ -15,7 +15,6 @@ import confluent.core as core
import confluent.messages as msg
import pyghmi.exceptions as pygexc
import confluent.exceptions as exc
import eventlet
import eventlet.queue as queue
import eventlet.greenpool as greenpool

68
confluent_server/confluent/plugins/hardwaremanagement/pdu.py
View File

@ -15,10 +15,16 @@ import confluent.core as core
import confluent.messages as msg
import pyghmi.exceptions as pygexc
import confluent.exceptions as exc
import eventlet.greenpool as greenpool
import eventlet.queue as queue
class TaskDone:
pass
def retrieve(nodes, element, configmanager, inputdata):
emebs = configmanager.get_node_attributes(
nodes, (u'power.*pdu', u'power.*outlet'))
relpdus = {}
if element == ['power', 'inlets']:
outletnames = set([])
for node in nodes:
@ -39,13 +45,36 @@ def retrieve(nodes, element, configmanager, inputdata):
for pgroup in outlets[node]:
pdu = outlets[node][pgroup]['pdu']
outlet = outlets[node][pgroup]['outlet']
try:
for rsp in core.handle_path(
'/nodes/{0}/power/outlets/{1}'.format(pdu, outlet),
'retrieve', configmanager):
yield msg.KeyValueData({pgroup: rsp.kvpairs['state']['value']}, node)
except exc.TargetEndpointBadCredentials:
yield msg.ConfluentTargetInvalidCredentials(pdu)
if pdu not in relpdus:
relpdus[pdu] = {}
relpdus[pdu][outlet] = (node, pgroup)
rspq = queue.Queue()
gp = greenpool.GreenPool(64)
for pdu in relpdus:
gp.spawn(readpdu, pdu, relpdus[pdu], configmanager, rspq)
while gp.running():
nrsp = rspq.get()
if not isinstance(nrsp, TaskDone):
yield nrsp
while not rspq.empty():
nrsp = rspq.get()
if not isinstance(nrsp, TaskDone):
yield nrsp
def readpdu(pdu, outletmap, configmanager, rspq):
try:
for outlet in outletmap:
node, pgroup = outletmap[outlet]
try:
for rsp in core.handle_path(
'/nodes/{0}/power/outlets/{1}'.format(pdu, outlet),
'retrieve', configmanager):
rspq.put(msg.KeyValueData({pgroup: rsp.kvpairs['state']['value']}, node))
except exc.TargetEndpointBadCredentials:
rspq.put(msg.ConfluentTargetInvalidCredentials(pdu))
finally: # ensure thhat at least one thing triggers the get
rspq.put(TaskDone())
def get_outlets(nodes, emebs, inletname):
outlets = {}
@ -72,11 +101,34 @@ def update(nodes, element, configmanager, inputdata):
emebs = configmanager.get_node_attributes(
nodes, (u'power.*pdu', u'power.*outlet'))
inletname = element[-1]
relpdus = {}
rspq = queue.Queue()
gp = greenpool.GreenPool(64)
outlets = get_outlets(nodes, emebs, inletname)
for node in outlets:
for pgroup in outlets[node]:
pdu = outlets[node][pgroup]['pdu']
outlet = outlets[node][pgroup]['outlet']
if pdu not in relpdus:
relpdus[pdu] = {}
relpdus[pdu][outlet] = (node, pgroup)
for pdu in relpdus:
gp.spawn(updatepdu, pdu, relpdus[pdu], configmanager, inputdata, rspq)
while gp.running():
nrsp = rspq.get()
if not isinstance(nrsp, TaskDone):
yield nrsp
while not rspq.empty():
nrsp = rspq.get()
if not isinstance(nrsp, TaskDone):
yield nrsp
def updatepdu(pdu, outletmap, configmanager, inputdata, rspq):
try:
for outlet in outletmap:
node, pgroup = outletmap[outlet]
for rsp in core.handle_path('/nodes/{0}/power/outlets/{1}'.format(pdu, outlet),
'update', configmanager, inputdata={'state': inputdata.powerstate(node)}):
yield msg.KeyValueData({pgroup: rsp.kvpairs['state']['value']}, node)
rspq.put(msg.KeyValueData({pgroup: rsp.kvpairs['state']['value']}, node))
finally:
rspq.put(TaskDone())