[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 8/9] python/qmp: remove Server.wait_closed() call for Python 3.12
From: |
John Snow |
Subject: |
[PULL 8/9] python/qmp: remove Server.wait_closed() call for Python 3.12 |
Date: |
Wed, 4 Oct 2023 15:46:12 -0400 |
This patch is a backport from
https://gitlab.com/qemu-project/python-qemu-qmp/-/commit/e03a3334b6a477beb09b293708632f2c06fe9f61
According to Guido in https://github.com/python/cpython/issues/104344 ,
this call was never meant to wait for the server to shut down - that is
handled synchronously - but instead, this waits for all connections to
close. Or, it would have, if it wasn't broken since it was introduced.
3.12 fixes the bug, which now causes a hang in our code. The fix is just
to remove the wait.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/qmp/protocol.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/python/qemu/qmp/protocol.py b/python/qemu/qmp/protocol.py
index 753182131fd..a4ffdfad51b 100644
--- a/python/qemu/qmp/protocol.py
+++ b/python/qemu/qmp/protocol.py
@@ -495,7 +495,6 @@ async def _stop_server(self) -> None:
try:
self.logger.debug("Stopping server.")
self._server.close()
- await self._server.wait_closed()
self.logger.debug("Server stopped.")
finally:
self._server = None
--
2.41.0
- [PULL 0/9] Python patches, John Snow, 2023/10/04
- [PULL 4/9] python/console_socket: accept existing FD in initializer, John Snow, 2023/10/04
- [PULL 2/9] python/machine: move socket setup out of _base_args property, John Snow, 2023/10/04
- [PULL 3/9] python/machine: close sock_pair in cleanup path, John Snow, 2023/10/04
- [PULL 5/9] python/machine: use socketpair() for console connections, John Snow, 2023/10/04
- [PULL 8/9] python/qmp: remove Server.wait_closed() call for Python 3.12,
John Snow <=
- [PULL 7/9] python/machine: remove unused sock_dir argument, John Snow, 2023/10/04
- [PULL 9/9] Python: test Python 3.12, John Snow, 2023/10/04
- [PULL 6/9] python/machine: use socketpair() for qtest connection, John Snow, 2023/10/04
- [PULL 1/9] Python/iotests: Add type hint for nbd module, John Snow, 2023/10/04
- Re: [PULL 0/9] Python patches, Philippe Mathieu-Daudé, 2023/10/05