From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>, John Snow <jsnow@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Cleber Rosa <crosa@redhat.com>
Subject: [PATCH 5/7] python/machine: handle "fast" QEMU terminations
Date: Thu, 18 Nov 2021 15:46:18 -0500 [thread overview]
Message-ID: <20211118204620.1897674-6-jsnow@redhat.com> (raw)
In-Reply-To: <20211118204620.1897674-1-jsnow@redhat.com>
In the case that the QEMU process actually launches -- but then dies so
quickly that we can't establish a QMP connection to it -- QEMUMachine
currently calls _post_shutdown() assuming that it never launched the VM
process.
This isn't true, though: it "merely" may have failed to establish a QMP
connection and the process is in the middle of its own exit path.
If we don't wait for the subprocess, the caller may get a bogus `None`
return for .exitcode(). This behavior was observed from
device-crash-test; after the switch to Async QMP, the timings were
changed such that it was now seemingly possible to witness the failure
of "vm.launch()" *prior* to the exitcode becoming available.
The semantic of the `_launched` property is changed in this
patch. Instead of representing the condition "launch() executed
successfully", it will now represent "has forked a child process
successfully". This way, wait() when called in the exit path won't
become a no-op.
Signed-off-by: John Snow <jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/machine/machine.py | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index f92e73de40..67ab06ca2b 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -349,9 +349,6 @@ def _post_shutdown(self) -> None:
Called to cleanup the VM instance after the process has exited.
May also be called after a failed launch.
"""
- # Comprehensive reset for the failed launch case:
- self._early_cleanup()
-
try:
self._close_qmp_connection()
except Exception as err: # pylint: disable=broad-except
@@ -400,9 +397,16 @@ def launch(self) -> None:
try:
self._launch()
- self._launched = True
except:
- self._post_shutdown()
+ # We may have launched the process but it may
+ # have exited before we could connect via QMP.
+ # Assume the VM didn't launch or is exiting.
+ # If we don't wait for the process, exitcode() may still be
+ # 'None' by the time control is ceded back to the caller.
+ if self._launched:
+ self.wait()
+ else:
+ self._post_shutdown()
LOG.debug('Error launching VM')
if self._qemu_full_args:
@@ -426,6 +430,7 @@ def _launch(self) -> None:
stderr=subprocess.STDOUT,
shell=False,
close_fds=False)
+ self._launched = True
self._post_launch()
def _close_qmp_connection(self) -> None:
@@ -457,8 +462,8 @@ def _early_cleanup(self) -> None:
"""
Perform any cleanup that needs to happen before the VM exits.
- May be invoked by both soft and hard shutdown in failover scenarios.
- Called additionally by _post_shutdown for comprehensive cleanup.
+ This method may be called twice upon shutdown, once each by soft
+ and hard shutdown in failover scenarios.
"""
# If we keep the console socket open, we may deadlock waiting
# for QEMU to exit, while QEMU is waiting for the socket to
--
2.31.1
next prev parent reply other threads:[~2021-11-18 20:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 20:46 [PATCH 0/7] python: More fixes for 6.2 John Snow
2021-11-18 20:46 ` [PATCH 1/7] python/machine: add @sock_dir property John Snow
2021-11-19 12:21 ` Willian Rampazzo
2021-11-18 20:46 ` [PATCH 2/7] python/machine: remove _remove_monitor_sockfile property John Snow
2021-11-19 12:22 ` Willian Rampazzo
2021-11-18 20:46 ` [PATCH 3/7] python/machine: add instance disambiguator to default nickname John Snow
2021-11-19 8:54 ` Philippe Mathieu-Daudé
2021-11-19 12:24 ` Willian Rampazzo
2021-11-18 20:46 ` [PATCH 4/7] python/machine: move more variable initializations to _pre_launch John Snow
2021-11-19 12:26 ` Willian Rampazzo
2021-11-18 20:46 ` John Snow [this message]
2021-11-19 16:09 ` [PATCH 5/7] python/machine: handle "fast" QEMU terminations Willian Rampazzo
2021-11-18 20:46 ` [PATCH 6/7] scripts/device-crash-test: Use a QMP timeout John Snow
2021-11-18 20:46 ` [PATCH 7/7] python/aqmp: fix send_fd_scm for python 3.6.x John Snow
2021-11-19 16:18 ` Willian Rampazzo
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=20211118204620.1897674-6-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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).