kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: poll for source VM exit after live-migration

Browse Source 
The post-migration check used a fixed `thread::sleep(3s)` followed by
`try_wait()` to verify the source VM had exited cleanly. That window
is too tight when the source process is the release binary used by
`test_live_upgrade_*` (i.e. `~/workloads/cloud-hypervisor-static`,
pinned to `migratable_version`).

The released binary is older than the locally-built destination and
its virtio-device teardown (resume-paused-thread -> kill -> join
across pmem, block, net, console, rng workers) regularly takes
longer than 3s on contended hosts, causing the test to report:

  thread 'common_parallel::test_live_upgrade_basic' panicked:
  Test failed: source VM was not terminated successfully.

even though the source process eventually exits with status 0.

Replace the fixed sleep with a `wait_until(Duration::from_secs(30),
...)` poll that returns as soon as `try_wait()` reports a reaped
child, then keep the existing `success()` check on the exit status.
This makes the assertion robust against the slower release-binary
shutdown path while still failing fast on a genuine error.

The same pattern was duplicated across eight migration helpers plus
the virtio-fs migration variant; convert all nine call sites for
consistency.

Signed-off-by: Muminul Islam <muislam@microsoft.com>
This commit is contained in:
Muminul Islam
2026-05-14 20:52:20 -07:00
committed by Rob Bradford
parent 2168ddf16b
commit fba55b3d9f
1 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
cloud-hypervisor/tests/integration.rs
View File

@@ -6442,9 +6442,10 @@ mod common_parallel {
);
}
// Check the source vm has been terminated successful (give it '3s' to settle)
thread::sleep(std::time::Duration::new(3, 0));
if !src_child.try_wait().unwrap().is_some_and(|s| s.success()) {
let src_exited_ok = wait_until(Duration::from_secs(30), || {
matches!(src_child.try_wait(), Ok(Some(_)))
}) && src_child.try_wait().unwrap().is_some_and(|s| s.success());
if !src_exited_ok {
print_and_panic(
src_child,
dest_child,
@@ -6581,9 +6582,10 @@ mod common_parallel {
);
}
// Check the source vm has been terminated successful (give it '3s' to settle)
thread::sleep(std::time::Duration::new(3, 0));
if !src_child.try_wait().unwrap().is_some_and(|s| s.success()) {
let src_exited_ok = wait_until(Duration::from_secs(30), || {
matches!(src_child.try_wait(), Ok(Some(_)))
}) && src_child.try_wait().unwrap().is_some_and(|s| s.success());
if !src_exited_ok {
print_and_panic(
src_child,
dest_child,
@@ -6807,9 +6809,10 @@ mod common_parallel {
);
}
// Check the source vm has been terminated successful (give it '3s' to settle)
thread::sleep(std::time::Duration::new(3, 0));
if !src_child.try_wait().unwrap().is_some_and(|s| s.success()) {
let src_exited_ok = wait_until(Duration::from_secs(30), || {
matches!(src_child.try_wait(), Ok(Some(_)))
}) && src_child.try_wait().unwrap().is_some_and(|s| s.success());
if !src_exited_ok {
print_and_panic(
src_child,
dest_child,
@@ -7191,9 +7194,10 @@ mod common_parallel {
);
}
// Check the source vm has been terminated successfully (give it '3s' to settle)
thread::sleep(Duration::from_secs(3));
if !src_child.try_wait().unwrap().is_some_and(|s| s.success()) {
let src_exited_ok = wait_until(Duration::from_secs(30), || {
matches!(src_child.try_wait(), Ok(Some(_)))
}) && src_child.try_wait().unwrap().is_some_and(|s| s.success());
if !src_exited_ok {
print_and_panic(
src_child,
dest_child,
@@ -7531,9 +7535,10 @@ mod ivshmem {
);
}
// Check the source vm has been terminated successful (give it '3s' to settle)
thread::sleep(std::time::Duration::new(3, 0));
if !src_child.try_wait().unwrap().is_some_and(|s| s.success()) {
let src_exited_ok = wait_until(Duration::from_secs(30), || {
matches!(src_child.try_wait(), Ok(Some(_)))
}) && src_child.try_wait().unwrap().is_some_and(|s| s.success());
if !src_exited_ok {
print_and_panic(
src_child,
dest_child,
@@ -9043,9 +9048,10 @@ mod common_sequential {
);
}
// Check the source vm has been terminated successful (give it '3s' to settle)
thread::sleep(std::time::Duration::new(3, 0));
if !src_child.try_wait().unwrap().is_some_and(|s| s.success()) {
let src_exited_ok = wait_until(Duration::from_secs(30), || {
matches!(src_child.try_wait(), Ok(Some(_)))
}) && src_child.try_wait().unwrap().is_some_and(|s| s.success());
if !src_exited_ok {
print_and_panic(
src_child,
dest_child,
@@ -9270,9 +9276,10 @@ mod common_sequential {
);
}
// Check the source vm has been terminated successful (give it '3s' to settle)
thread::sleep(std::time::Duration::new(3, 0));
if !src_child.try_wait().unwrap().is_some_and(|s| s.success()) {
let src_exited_ok = wait_until(Duration::from_secs(30), || {
matches!(src_child.try_wait(), Ok(Some(_)))
}) && src_child.try_wait().unwrap().is_some_and(|s| s.success());
if !src_exited_ok {
print_and_panic(
src_child,
dest_child,
@@ -9404,9 +9411,10 @@ mod common_sequential {
);
}
// Check the source vm has been terminated successful (give it '3s' to settle)
thread::sleep(std::time::Duration::new(3, 0));
if !src_child.try_wait().unwrap().is_some_and(|s| s.success()) {
let src_exited_ok = wait_until(Duration::from_secs(30), || {
matches!(src_child.try_wait(), Ok(Some(_)))
}) && src_child.try_wait().unwrap().is_some_and(|s| s.success());
if !src_exited_ok {
print_and_panic(
src_child,
dest_child,
@@ -9683,9 +9691,10 @@ mod common_sequential {
);
}
// Check the source vm has been terminated successful (give it '3s' to settle)
thread::sleep(std::time::Duration::new(3, 0));
if !src_child.try_wait().unwrap().is_some_and(|s| s.success()) {
let src_exited_ok = wait_until(Duration::from_secs(30), || {
matches!(src_child.try_wait(), Ok(Some(_)))
}) && src_child.try_wait().unwrap().is_some_and(|s| s.success());
if !src_exited_ok {
print_and_panic(
src_child,
dest_child,