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
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From: John Snow <jsnow@redhat.com>
|
|
Date: Fri, 25 Feb 2022 15:59:47 -0500
|
|
Subject: python/aqmp: fix race condition in legacy.py
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: 673856f9d889dc50b6a1a7964df960c4f00c7c93
|
|
|
|
legacy.py provides a synchronous model. iotests frequently uses this
|
|
paradigm:
|
|
|
|
- create QMP client object
|
|
- start QEMU process
|
|
- await connection from QEMU process
|
|
|
|
In the switch from sync to async QMP, the QMP client object stopped
|
|
calling bind() and listen() during the QMP object creation step, which
|
|
creates a race condition if the QEMU process dials in too quickly.
|
|
|
|
With refactoring out of the way, restore the former behavior of calling
|
|
bind() and listen() during __init__() to fix this race condition.
|
|
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Message-id: 20220225205948.3693480-10-jsnow@redhat.com
|
|
[Expanded commit message. --js]
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
python/qemu/aqmp/legacy.py | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/python/qemu/aqmp/legacy.py b/python/qemu/aqmp/legacy.py
|
|
index dca1e76ed4994959caf542031363..cb50e60564823fdc0aeeb194c5e3 100644
|
|
--- a/python/qemu/aqmp/legacy.py
|
|
+++ b/python/qemu/aqmp/legacy.py
|
|
@@ -57,7 +57,7 @@ class QEMUMonitorProtocol(qemu.qmp.QEMUMonitorProtocol):
|
|
self._timeout: Optional[float] = None
|
|
|
|
if server:
|
|
- self._aqmp._bind_hack(address) # pylint: disable=protected-access
|
|
+ self._sync(self._aqmp.start_server(address))
|
|
|
|
_T = TypeVar('_T')
|
|
|
|
@@ -90,10 +90,7 @@ class QEMUMonitorProtocol(qemu.qmp.QEMUMonitorProtocol):
|
|
self._aqmp.await_greeting = True
|
|
self._aqmp.negotiate = True
|
|
|
|
- self._sync(
|
|
- self._aqmp.start_server_and_accept(self._address),
|
|
- timeout
|
|
- )
|
|
+ self._sync(self._aqmp.accept(), timeout)
|
|
|
|
ret = self._get_greeting()
|
|
assert ret is not None
|