xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 01:22:00 +00:00
Code Issues Projects Releases Wiki Activity

Rework ipmi console object to block on connect

Browse Source 
Previously, the state would be seen as 'connected' and then 'disconnected' in event of
connection failing.  Rework things such that the console session stays in 'connecting' state
until timeout or success occurs and don't send disconnect, instead raising an exception.
This makes the connection action a bit more intuitive to the user, who would assume a 'connected'
console means the endpoint was reachable.  This may not always be possible in a console plugin,
but it's a nice pattern when possible.  If a console plugin cannot tell when 'connected' happens, then
the previous behavior of this plugin makes sense as a 'best effort': return 'connected', send
disconnect event when the console turns out to be bad.  For example, executable consoles are most
likely going to follow this pattern.  An option could be for an executable to have a certain
signature to print to show 'connected' though...
This commit is contained in:
Jarrod Johnson 2014-04-01 16:53:20 -04:00
parent 6fcfc70985
commit a29032e70c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/hardwaremanagement/ipmi.py
View File

@ -16,11 +16,15 @@ console.session.select = eventlet.green.select
console.session.threading = eventlet.green.threading
_ipmithread = None
_ipmiwaiters = []
def _ipmi_evtloop():
while True:
try:
console.session.Session.wait_for_rsp(timeout=600)
while _ipmiwaiters:
waiter = _ipmiwaiters.pop()
waiter.send()
except:
import traceback
traceback.print_exc()
@ -73,6 +77,7 @@ class IpmiConsole(conapi.Console):
self.kg = connparams['kg']
self.bmc = connparams['bmc']
self.port = connparams['port']
self.connected = False
# Cannot actually create console until 'connect', when we get callback
def handle_data(self, data):
@ -80,7 +85,9 @@ class IpmiConsole(conapi.Console):
disconnect = frozenset(('Session Disconnected', 'timeout'))
if 'error' in data and data['error'] in disconnect:
self.broken = True
self.datacallback(conapi.ConsoleEvent.Disconnect)
self.error = data['error']
if self.connected:
self.datacallback(conapi.ConsoleEvent.Disconnect)
else:
raise Exception("Unrecognized pyghmi input %s" % repr(data))
else:
@ -94,9 +101,16 @@ class IpmiConsole(conapi.Console):
password=self.password,
kg=self.kg, force=True,
iohandler=self.handle_data)
while not self.solconnection.connected and not self.broken:
w = eventlet.event.Event()
_ipmiwaiters.append(w)
w.wait()
if self.broken:
raise exc.TargetEndpointUnreachable(self.error)
except socket.gaierror as err:
raise exc.TargetEndpointUnreachable(str(err))
def write(self, data):
self.solconnection.send_data(data)