xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 11:12:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5569 from xuweibj/reset

Browse Source 
retry in rpower reset when get 'Connection aborted' [ DO NOT MERGE ]
This commit is contained in:
Mark Gurevich 2018-09-07 09:11:29 -04:00 committed by GitHub
commit 83a8245a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
View File

@ -109,12 +109,15 @@ class OpenBMCPowerTask(ParallelNodesCommand):
off_flag = False
start_timeStamp = int(time.time())
for i in range (0, 30):
states = obmc.list_power_states()
status = obmc.get_host_state(states)
if openbmc.RPOWER_STATES.get(status) == 'off':
off_flag = True
break
gevent.sleep( 2 )
try:
states = obmc.list_power_states()
status = obmc.get_host_state(states)
if openbmc.RPOWER_STATES.get(status) == 'off':
off_flag = True
break
except SelfServerException as e:
continue
end_timeStamp = int(time.time())
@ -123,10 +126,18 @@ class OpenBMCPowerTask(ParallelNodesCommand):
'to off after waiting %s seconds. (State= %s).' % (end_timeStamp - start_timeStamp, status)
raise SelfServerException(error)
ret = obmc.set_power_state('on')
self.callback.update_node_attributes('status', node, POWER_STATE_DB['on'])
for i in range(0, 2):
try:
ret = obmc.set_power_state('on')
self.callback.update_node_attributes('status', node, POWER_STATE_DB['on'])
self.callback.info('%s: %s' % (node, 'reset'))
return
except SelfServerException as e:
self.callback.syslog('%s: %s' % (node, e.message))
gevent.sleep( 1 )
continue
self.callback.info('%s: %s' % (node, 'reset'))
self.callback.error(e.message, node)
except (SelfServerException, SelfClientException) as e:
self.callback.error(e.message, node)

2
xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
View File

@ -345,7 +345,7 @@ class OpenBMCRest(object):
e.message = "Login to BMC failed: Can't connect to {0} {1}.".format(e.host_and_port, e.detail_msg)
else:
e.message = 'BMC did not respond. ' \
'Validate BMC configuration and retry the command.'
'Validate BMC configuration and retry the command. ' + e.detail_msg
self._print_error_log(e.message, cmd)
raise
except ValueError: