2
0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-18 05:33:17 +00:00

Fix timeout on persistent IPMI session

If there is a persistent IPMI session and the first to notice was a user request
it would fail with unexpected error.  Correct the situation to expect the error
and report more precisely as to the cause.
This commit is contained in:
Jarrod Johnson 2014-07-29 09:49:52 -04:00
parent 230397c2a3
commit a0ae523768

View File

@ -21,6 +21,7 @@ import eventlet.green.threading as threading
import eventlet.greenpool as greenpool
import eventlet.queue
import pyghmi.constants as pygconstants
import pyghmi.exceptions as pygexc
import pyghmi.ipmi.console as console
import pyghmi.ipmi.command as ipmicommand
import socket
@ -205,8 +206,13 @@ class IpmiIterator(object):
def perform_request(operator, node, element, configdata, inputdata, cfg):
return IpmiHandler(operator, node, element, configdata, inputdata, cfg
).handle_request()
try:
return IpmiHandler(operator, node, element, configdata, inputdata, cfg
).handle_request()
except pygexc.IpmiException as ipmiexc:
excmsg = str(ipmiexc)
if excmsg == 'Session no longer connected':
return msg.ConfluentTargetTimeout(node)
persistent_ipmicmds = {}