xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-01-27 19:37:44 +00:00
Code Issues Projects Releases Wiki Activity

Move SOL payload retries to console.py

Browse Source 
SOL packets are treated differently and as such should
interleave with non-console data.  Particularly if SOL payload gets
deactivated by something else, do not presume the whole session to
be broken (leave that to the command based keepalive).

Change-Id: Ic70b57cd6834e6936f1d5a6b855dbe835200ad41
This commit is contained in:
Jarrod Johnson 2018-06-11 14:41:28 -04:00
parent 2df9280c8e
commit cf4adce3e9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pyghmi/ipmi/console.py
View File

@ -22,6 +22,7 @@ import threading
from pyghmi.ipmi.private import constants
from pyghmi.ipmi.private import session
from pyghmi.ipmi.private.util import _monotonic_time
class Console(object):
@ -266,7 +267,18 @@ class Console(object):
self.awaitingack = True
payload = struct.unpack("%dB" % len(payload), payload)
self.lastpayload = payload
self.send_payload(payload, needskeepalive=needskeepalive)
self.send_payload(payload, retry=False, needskeepalive=needskeepalive)
retries = 5
while retries and self.awaitingack:
expiry = _monotonic_time() + 5.5 - retries
while self.awaitingack and _monotonic_time() < expiry:
self.wait_for_rsp(0.5)
if self.awaitingack:
self.send_payload(payload, retry=False,
needskeepalive=needskeepalive)
retries -= 1
if not retries:
self._print_error('Connection lost')
def send_payload(self, payload, payload_type=1, retry=True,
needskeepalive=False):
@ -382,7 +394,7 @@ class Console(object):
# try to mitigate by avoiding overeager retries
# occasional retry of a packet
# sooner than timeout suggests is evidently a big deal
self.send_payload(payload=self.lastpayload)
self.send_payload(payload=self.lastpayload, retry=False)
def main_loop(self):
"""Process all events until no more sessions exist.