OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

python/aqmp: handle asyncio.TimeoutError on execute()

Browse Source 
This exception can be injected into any await statement. If we are
canceled via timeout, we want to clear the pending execution record on
our way out.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
John Snow 2022-01-10 18:28:46 -05:00
parent 3bc72e3aed
commit 3b5bf136f5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/qemu/aqmp/qmp_client.py
View File

@ -435,7 +435,11 @@ class QMPClient(AsyncProtocol[Message], Events):
msg_id = msg['id'] msg_id = msg['id']
self._pending[msg_id] = asyncio.Queue(maxsize=1) self._pending[msg_id] = asyncio.Queue(maxsize=1)
await self._outgoing.put(msg) try:
await self._outgoing.put(msg)
except:
del self._pending[msg_id]
raise
return msg_id return msg_id
@ -452,9 +456,9 @@ class QMPClient(AsyncProtocol[Message], Events):
was lost, or some other problem. was lost, or some other problem.
""" """
queue = self._pending[msg_id] queue = self._pending[msg_id]
result = await queue.get()
try: try:
result = await queue.get()
if isinstance(result, ExecInterruptedError): if isinstance(result, ExecInterruptedError):
raise result raise result
return result return result