01f9005feb
- Backport aqmp patches from upstream which can fix iotest issues * Patches added: python-aqmp-add-__del__-method-to-legacy.patch python-aqmp-add-_session_guard.patch python-aqmp-add-SocketAddrT-to-package-r.patch python-aqmp-add-socket-bind-step-to-lega.patch python-aqmp-add-start_server-and-accept-.patch python-aqmp-copy-type-definitions-from-q.patch python-aqmp-drop-_bind_hack.patch python-aqmp-fix-docstring-typo.patch python-aqmp-Fix-negotiation-with-pre-oob.patch python-aqmp-fix-race-condition-in-legacy.patch Python-aqmp-fix-type-definitions-for-myp.patch python-aqmp-handle-asyncio.TimeoutError-.patch python-aqmp-refactor-_do_accept-into-two.patch python-aqmp-remove-_new_session-and-_est.patch python-aqmp-rename-accept-to-start_serve.patch python-aqmp-rename-AQMPError-to-QMPError.patch python-aqmp-split-_client_connected_cb-o.patch python-aqmp-squelch-pylint-warning-for-t.patch python-aqmp-stop-the-server-during-disco.patch python-introduce-qmp-shell-wrap-convenie.patch python-machine-raise-VMLaunchFailure-exc.patch python-move-qmp-shell-under-the-AQMP-pac.patch python-move-qmp-utilities-to-python-qemu.patch python-qmp-switch-qmp-shell-to-AQMP.patch python-support-recording-QMP-session-to-.patch python-upgrade-mypy-to-0.780.patch - Drop the patches which are workaround to fix iotest issues * Patches dropped: Revert-python-iotests-replace-qmp-with-a.patch Revert-python-machine-add-instance-disam.patch Revert-python-machine-add-sock_dir-prope.patch Revert-python-machine-handle-fast-QEMU-t.patch Revert-python-machine-move-more-variable.patch Revert-python-machine-remove-_remove_mon.patch OBS-URL: https://build.opensuse.org/request/show/966963 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=708
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From: John Snow <jsnow@redhat.com>
|
|
Date: Mon, 10 Jan 2022 18:28:46 -0500
|
|
Subject: python/aqmp: handle asyncio.TimeoutError on execute()
|
|
|
|
Git-commit: 3b5bf136f5798a4ea2c66875d6337ca3d6b79434
|
|
|
|
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>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
python/qemu/aqmp/qmp_client.py | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/python/qemu/aqmp/qmp_client.py b/python/qemu/aqmp/qmp_client.py
|
|
index 6b43e1dbbe38eded19fd0115e8bc..45864f288e4fe5a7505c0022ed13 100644
|
|
--- a/python/qemu/aqmp/qmp_client.py
|
|
+++ b/python/qemu/aqmp/qmp_client.py
|
|
@@ -435,7 +435,11 @@ class QMPClient(AsyncProtocol[Message], Events):
|
|
msg_id = msg['id']
|
|
|
|
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
|
|
|
|
@@ -452,9 +456,9 @@ class QMPClient(AsyncProtocol[Message], Events):
|
|
was lost, or some other problem.
|
|
"""
|
|
queue = self._pending[msg_id]
|
|
- result = await queue.get()
|
|
|
|
try:
|
|
+ result = await queue.get()
|
|
if isinstance(result, ExecInterruptedError):
|
|
raise result
|
|
return result
|