[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/10] tests/avocado: reverse_debugging drain console to prevent h
|
From: |
Thomas Huth |
|
Subject: |
[PULL 09/10] tests/avocado: reverse_debugging drain console to prevent hang |
|
Date: |
Thu, 16 Nov 2023 19:05:33 +0100 |
From: Nicholas Piggin <npiggin@gmail.com>
Like replay_linux.py, reverse_debugging.py starts the vm with console
set but does not interact with it (e.g., with wait_for_console_pattern).
In this situation, the console should have a drainer attached so the
socket does not fill. replay_linux.py has a drainer, but it is missing
from reverse_debugging.py.
Per analysis in Link: this can cause the console socket/pipe to fill and
QEMU get stuck in qemu_chr_write_buffer, leading to strange test case
failures (ppc64 fails because it prints a lot to console in early bios).
Attaching a drainer prevents this.
Note, this commit does not fix bugs introduced by the commits referenced
in the first two Fixes: tags, but together those commits conspire to
irritate the problem and cause test case failure, which this commit
fixes.
Link: ZVT-bY9YOr69QTPX@redhat.com/">https://lore.kernel.org/qemu-devel/ZVT-bY9YOr69QTPX@redhat.com/
Fixes: 1d4796cd0083 ("python/machine: use socketpair() for console connections")
Fixes: 761a13b23946 ("tests/avocado: ppc64 reverse debugging tests for pseries
and powernv")
Fixes: be52eca30978 ("tests/acceptance: add reverse debugging test")
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Message-ID: <20231116115354.228678-1-npiggin@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/avocado/reverse_debugging.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tests/avocado/reverse_debugging.py
b/tests/avocado/reverse_debugging.py
index fc47874eda..128d85bc0e 100644
--- a/tests/avocado/reverse_debugging.py
+++ b/tests/avocado/reverse_debugging.py
@@ -12,6 +12,7 @@
from avocado import skipIf
from avocado_qemu import BUILD_DIR
+from avocado.utils import datadrainer
from avocado.utils import gdb
from avocado.utils import process
from avocado.utils.network.ports import find_free_port
@@ -52,6 +53,10 @@ def run_vm(self, record, shift, args, replay_path,
image_path, port):
if args:
vm.add_args(*args)
vm.launch()
+ console_drainer = datadrainer.LineLogger(vm.console_socket.fileno(),
+ logger=self.log.getChild('console'),
+ stop_check=(lambda : not vm.is_running()))
+ console_drainer.start()
return vm
@staticmethod
--
2.41.0
- [PULL 00/10] Avocado test fixes, Thomas Huth, 2023/11/16
- [PULL 01/10] tests/avocado: Replace assertEquals() for Python 3.12 compatibility, Thomas Huth, 2023/11/16
- [PULL 05/10] tests/avocado/multiprocess: Add asset hashes to silence warnings, Thomas Huth, 2023/11/16
- [PULL 03/10] tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support, Thomas Huth, 2023/11/16
- [PULL 02/10] tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatibility, Thomas Huth, 2023/11/16
- [PULL 07/10] tests/avocado/replay_kernel: Mark the test_x86_64_pc as flaky, Thomas Huth, 2023/11/16
- [PULL 06/10] tests/avocado: Make fetch_asset() unconditionally require a crypto hash, Thomas Huth, 2023/11/16
- [PULL 09/10] tests/avocado: reverse_debugging drain console to prevent hang,
Thomas Huth <=
- [PULL 04/10] tests/avocado/intel_iommu: Add asset hashes to avoid warnings, Thomas Huth, 2023/11/16
- [PULL 08/10] tests/avocado/mem-addr-space-check: Replace assertEquals() for Python 3.12, Thomas Huth, 2023/11/16
- [PULL 10/10] tests/avocado: Enable reverse_debugging.py tests in gitlab CI, Thomas Huth, 2023/11/16
- Re: [PULL 00/10] Avocado test fixes, Stefan Hajnoczi, 2023/11/20