From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
Stefan Hajnoczi <stefanha@gmail.com>
Subject: [PULL 14/14] tests/functional/test_x86_64_hotplug_cpu: Fix race condition during unplug
Date: Wed, 8 Jan 2025 09:45:11 +0100 [thread overview]
Message-ID: <20250108084511.238458-15-thuth@redhat.com> (raw)
In-Reply-To: <20250108084511.238458-1-thuth@redhat.com>
When unplugging the CPU, the test tries to check for a successful
unplug by changing to the /sys/devices/system/cpu/cpu1 directory
to see whether that fails. However, the "cd" could be faster than
the unplug operation in the kernel, so there is a race condition
and the test sometimes fails here.
Fix it by trying to change the directory in a loop until the the
CPU has really been unplugged.
While we're at it, also add a "cd .." before unplugging to make
the console output a little bit less confusing (since the path
is echoed in the shell prompt).
Reported-by: Stefan Hajnoczi <stefanha@gmail.com>
Message-ID: <20250107115245.52755-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/functional/test_x86_64_hotplug_cpu.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/functional/test_x86_64_hotplug_cpu.py b/tests/functional/test_x86_64_hotplug_cpu.py
index b1d5156c72..7b9200ac2e 100755
--- a/tests/functional/test_x86_64_hotplug_cpu.py
+++ b/tests/functional/test_x86_64_hotplug_cpu.py
@@ -59,11 +59,13 @@ def test_hotplug(self):
'cd /sys/devices/system/cpu/cpu1',
'cpu1#')
+ exec_command_and_wait_for_pattern(self, 'cd ..', prompt)
self.vm.cmd('device_del', id='c1')
exec_command_and_wait_for_pattern(self,
- 'cd /sys/devices/system/cpu/cpu1',
- 'No such file or directory')
+ 'while cd /sys/devices/system/cpu/cpu1 ;'
+ ' do sleep 0.2 ; done',
+ 'No such file or directory')
if __name__ == '__main__':
LinuxKernelTest.main()
--
2.47.1
next prev parent reply other threads:[~2025-01-08 8:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-08 8:44 [PULL 00/14] Fixes for tests and removal of deprecated features Thomas Huth
2025-01-08 8:44 ` [PULL 01/14] tests/tcg/s390x: Use the SLOF libc headers for the multiarch tests Thomas Huth
2025-01-08 8:44 ` [PULL 02/14] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.4 and 2.5 machine types Thomas Huth
2025-01-08 8:45 ` [PULL 03/14] hw/s390x/s390-skeys: Remove the "migration-enabled" property Thomas Huth
2025-01-08 8:45 ` [PULL 04/14] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.6 machine type Thomas Huth
2025-01-08 8:45 ` [PULL 05/14] hw/s390x: Remove the "ri_allowed" switch Thomas Huth
2025-01-08 8:45 ` [PULL 06/14] hw/s390x/ipl: Remove the "iplbext_migration" property Thomas Huth
2025-01-08 8:45 ` [PULL 07/14] hw/s390x/css-bridge: Remove the "css_dev_path" property Thomas Huth
2025-01-08 8:45 ` [PULL 08/14] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.7 machine type Thomas Huth
2025-01-08 8:45 ` [PULL 09/14] hw/s390x: Remove the cpu_model_allowed flag and related code Thomas Huth
2025-01-08 8:45 ` [PULL 10/14] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.8 machine type Thomas Huth
2025-01-08 8:45 ` [PULL 11/14] hw/s390x: Remove the "adapter_routes_max_batch" property from the flic Thomas Huth
2025-01-08 8:45 ` [PULL 12/14] Remove the deprecated "-runas" command line option Thomas Huth
2025-01-08 8:45 ` [PULL 13/14] docs/about/deprecated: Remove paragraph about initial deprecation in 2.10 Thomas Huth
2025-01-08 8:45 ` Thomas Huth [this message]
2025-01-08 19:14 ` [PULL 00/14] Fixes for tests and removal of deprecated features Stefan Hajnoczi
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=20250108084511.238458-15-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
--cc=stefanha@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.