[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/7] scripts/device-crash-test: Use a QMP timeout
From: |
John Snow |
Subject: |
[PULL 6/7] scripts/device-crash-test: Use a QMP timeout |
Date: |
Mon, 22 Nov 2021 21:38:04 -0500 |
Despite all the previous fixes, it's still possible for
device-crash-test to wedge itself in the case that QEMU terminates *so
quickly* that it doesn't even begin a connection attempt to our QMP
client. Python will just joyfully wait ad infinitum for a connection
that will now never arrive.
The real fix is to use asyncio to simultaneously poll both the health of
the launched process AND the connection attempt. That's quite a bit more
invasive than just setting a connection timeout, though.
Do the very simplest thing for now.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20211118204620.1897674-7-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/device-crash-test | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index 1c73dac93e..7fbd99158b 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -353,7 +353,7 @@ def checkOneCase(args, testcase):
'-device', qemuOptsEscape(device)]
cmdline = ' '.join([binary] + args)
dbg("will launch QEMU: %s", cmdline)
- vm = QEMUMachine(binary=binary, args=args)
+ vm = QEMUMachine(binary=binary, args=args, qmp_timer=15)
exc = None
exc_traceback = None
--
2.31.1
- [PULL 0/7] Python patches, John Snow, 2021/11/22
- [PULL 1/7] python/machine: add @sock_dir property, John Snow, 2021/11/22
- [PULL 2/7] python/machine: remove _remove_monitor_sockfile property, John Snow, 2021/11/22
- [PULL 3/7] python/machine: add instance disambiguator to default nickname, John Snow, 2021/11/22
- [PULL 5/7] python/machine: handle "fast" QEMU terminations, John Snow, 2021/11/22
- [PULL 4/7] python/machine: move more variable initializations to _pre_launch, John Snow, 2021/11/22
- [PULL 6/7] scripts/device-crash-test: Use a QMP timeout,
John Snow <=
- [PULL 7/7] python/aqmp: fix send_fd_scm for python 3.6.x, John Snow, 2021/11/22
- Re: [PULL 0/7] Python patches, Richard Henderson, 2021/11/23