xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2026-01-10 18:22:32 +00:00
Code Issues Projects Releases Wiki Activity

Tolerate a few timeouts while trying to monitor an update

Browse Source 
Very long lived updates may incur hundreds of status checks, and we need to
tolerate a few.

Change-Id: Id4347d0c854679cde60da42c4cf1921ef53e2a20
This commit is contained in:
Jarrod Johnson
2025-04-15 09:10:38 -04:00
parent e87d8e334b
commit ae19b05df4
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pyghmi/ipmi/oem/lenovo/imm.py
View File

@@ -2101,14 +2101,18 @@ class XCCClient(IMMClient):
# the validating phase; add a retry here so we don't exit the loop in this case
retry = 3
while not complete and retry > 0:
pgress, status = self.grab_redfish_response_with_status(
monitorurl)
try:
pgress, status = self.grab_redfish_response_with_status(
monitorurl)
except socket.timeout:
pgress = None
if status < 200 or status >= 300:
raise Exception(pgress)
if not pgress:
retry -= 1
ipmisession.Session.pause(3)
continue
retry = 3 # reset retry counter
for msg in pgress.get('Messages', []):
if 'Verify failed' in msg.get('Message', ''):
raise Exception(msg['Message'])
@@ -2129,6 +2133,8 @@ class XCCClient(IMMClient):
ipmisession.Session.pause(3)
else:
ipmisession.Session.pause(3)
if not retry:
raise Exception('Falied to monitor update progress due to excessive timeouts')
if bank == 'backup':
return 'complete'
return 'pending'

8
pyghmi/redfish/oem/generic.py
View File

@@ -1114,11 +1114,15 @@ class OEMHandler(object):
retry = 3
pct = 0.0
while not complete and retry > 0:
pgress = self._do_web_request(monitorurl, cache=False)
try:
pgress = self._do_web_request(monitorurl, cache=False)
except socket.timeout:
pgress = None
if not pgress:
retry -= 1
time.sleep(3)
continue
retry = 3 # reset retry counter
for msg in pgress.get('Messages', []):
if 'Verify failed' in msg.get('Message', ''):
raise Exception(msg['Message'])
@@ -1143,6 +1147,8 @@ class OEMHandler(object):
time.sleep(3)
else:
time.sleep(3)
if not retry:
raise Exception('Falied to monitor update progress due to excessive timeouts')
return 'pending'
finally:
if 'HttpPushUriTargetsBusy' in usd:

8
pyghmi/redfish/oem/lenovo/xcc.py
View File

@@ -1308,11 +1308,15 @@ class OEMHandler(generic.OEMHandler):
# the validating phase; add a retry here so we don't exit the loop in this case
retry = 3
while not complete and retry > 0:
pgress = self._do_web_request(monitorurl, cache=False)
try:
pgress = self._do_web_request(monitorurl, cache=False)
except socket.timeout:
pgress = None
if not pgress:
retry -= 1
time.sleep(3)
continue
retry = 3 # reset retry counter
for msg in pgress.get('Messages', []):
if 'Verify failed' in msg.get('Message', ''):
raise Exception(msg['Message'])
@@ -1334,6 +1338,8 @@ class OEMHandler(generic.OEMHandler):
time.sleep(3)
else:
time.sleep(3)
if not retry:
raise Exception('Falied to monitor update progress due to excessive timeouts')
if bank == 'backup':
return 'complete'
return 'pending'