From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Daniel Berrange <berrange@redhat.com>,
Beraldo Leal <bleal@redhat.com>, Cleber Rosa <crosa@redhat.com>,
John Snow <jsnow@redhat.com>
Subject: [PATCH 07/10] python/aqmp: stop the server during disconnect()
Date: Fri, 25 Feb 2022 15:59:45 -0500 [thread overview]
Message-ID: <20220225205948.3693480-8-jsnow@redhat.com> (raw)
In-Reply-To: <20220225205948.3693480-1-jsnow@redhat.com>
Before we allow the full separation of starting the server and accepting
new connections, make sure that the disconnect cleans up the server and
its new state, too.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/aqmp/protocol.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/python/qemu/aqmp/protocol.py b/python/qemu/aqmp/protocol.py
index e2bdad542d..cdbc9cba0d 100644
--- a/python/qemu/aqmp/protocol.py
+++ b/python/qemu/aqmp/protocol.py
@@ -432,7 +432,7 @@ def _set_state(self, state: Runstate) -> None:
self._runstate_event.set()
self._runstate_event.clear()
- @bottom_half # However, it does not run from the R/W tasks.
+ @bottom_half
async def _stop_server(self) -> None:
"""
Stop listening for / accepting new incoming connections.
@@ -709,6 +709,7 @@ def _paranoid_task_erase(task: Optional['asyncio.Future[_U]']
self._reader = None
self._writer = None
+ self._accepted = None
# NB: _runstate_changed cannot be cleared because we still need it to
# send the final runstate changed event ...!
@@ -732,6 +733,9 @@ async def _bh_disconnect(self) -> None:
def _done(task: Optional['asyncio.Future[Any]']) -> bool:
return task is not None and task.done()
+ # If the server is running, stop it.
+ await self._stop_server()
+
# Are we already in an error pathway? If either of the tasks are
# already done, or if we have no tasks but a reader/writer; we
# must be.
--
2.34.1
next prev parent reply other threads:[~2022-02-25 21:16 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-25 20:59 [PATCH 00/10] Python: Fix qmp race condition on accept() John Snow
2022-02-25 20:59 ` [PATCH 01/10] python/aqmp: add _session_guard() John Snow
2022-03-04 17:34 ` Daniel P. Berrangé
2022-02-25 20:59 ` [PATCH 02/10] python/aqmp: rename 'accept()' to 'start_server_and_accept()' John Snow
2022-03-04 17:48 ` Daniel P. Berrangé
2022-02-25 20:59 ` [PATCH 03/10] python/aqmp: remove _new_session and _establish_connection John Snow
2022-03-04 17:50 ` Daniel P. Berrangé
2022-02-25 20:59 ` [PATCH 04/10] python/aqmp: split _client_connected_cb() out as _incoming() John Snow
2022-03-04 17:53 ` Daniel P. Berrangé
2022-02-25 20:59 ` [PATCH 05/10] python/aqmp: squelch pylint warning for too many lines John Snow
2022-03-04 17:55 ` Daniel P. Berrangé
2022-02-25 20:59 ` [PATCH 06/10] python/aqmp: refactor _do_accept() into two distinct steps John Snow
2022-03-04 17:57 ` Daniel P. Berrangé
2022-02-25 20:59 ` John Snow [this message]
2022-03-04 17:57 ` [PATCH 07/10] python/aqmp: stop the server during disconnect() Daniel P. Berrangé
2022-02-25 20:59 ` [PATCH 08/10] python/aqmp: add start_server() and accept() methods John Snow
2022-03-04 17:59 ` Daniel P. Berrangé
2022-02-25 20:59 ` [PATCH 09/10] python/aqmp: fix race condition in legacy.py John Snow
2022-03-04 18:01 ` Daniel P. Berrangé
2022-03-04 18:23 ` John Snow
2022-02-25 20:59 ` [PATCH 10/10] python/aqmp: drop _bind_hack() John Snow
2022-03-04 18:03 ` Daniel P. Berrangé
2022-03-03 22:37 ` [PATCH 00/10] Python: Fix qmp race condition on accept() John Snow
2022-03-04 17:49 ` Kevin Wolf
2022-03-04 18:28 ` John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220225205948.3693480-8-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).