dsg/cloud-hypervisor
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: Serialise the live migration/upgrade NUMA/balloon tests

Browse source 
These tests use relatively large memory allocations and if they are
allowed to run in parallel can result in the container encountering an
OOM situation.

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
This commit is contained in:
Rob Bradford 2024-05-04 09:49:00 +01:00
parent f5abb168e3
commit 622a1a3735
1 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

76
tests/integration.rs
View file

@ -9724,18 +9724,6 @@ mod live_migration {
_test_live_migration(false, true)
}
#[test]
#[cfg(not(feature = "mshv"))]
fn test_live_migration_numa() {
_test_live_migration_numa(false, false)
}
#[test]
#[cfg(not(feature = "mshv"))]
fn test_live_migration_numa_local() {
_test_live_migration_numa(false, true)
}
#[test]
fn test_live_migration_watchdog() {
_test_live_migration_watchdog(false, false)
@ -9746,16 +9734,6 @@ mod live_migration {
_test_live_migration_watchdog(false, true)
}
#[test]
fn test_live_migration_balloon() {
_test_live_migration_balloon(false, false)
}
#[test]
fn test_live_migration_balloon_local() {
_test_live_migration_balloon(false, true)
}
#[test]
fn test_live_upgrade_basic() {
_test_live_migration(true, false)
@ -9766,18 +9744,6 @@ mod live_migration {
_test_live_migration(true, true)
}
#[test]
#[cfg(not(feature = "mshv"))]
fn test_live_upgrade_numa() {
_test_live_migration_numa(true, false)
}
#[test]
#[cfg(not(feature = "mshv"))]
fn test_live_upgrade_numa_local() {
_test_live_migration_numa(true, true)
}
#[test]
fn test_live_upgrade_watchdog() {
_test_live_migration_watchdog(true, false)
@ -9787,6 +9753,22 @@ mod live_migration {
fn test_live_upgrade_watchdog_local() {
_test_live_migration_watchdog(true, true)
}
}
mod live_migration_sequential {
use super::*;
// NUMA & baalloon live migration tests are large so run sequentially
#[test]
fn test_live_migration_balloon() {
_test_live_migration_balloon(false, false)
}
#[test]
fn test_live_migration_balloon_local() {
_test_live_migration_balloon(false, true)
}
#[test]
fn test_live_upgrade_balloon() {
@ -9797,12 +9779,30 @@ mod live_migration {
fn test_live_upgrade_balloon_local() {
_test_live_migration_balloon(true, true)
}
}
mod live_migration_sequential {
#[cfg(target_arch = "x86_64")]
#[test]
#[cfg(not(feature = "mshv"))]
use super::*;
fn test_live_migration_numa() {
_test_live_migration_numa(false, false)
}
#[test]
#[cfg(not(feature = "mshv"))]
fn test_live_migration_numa_local() {
_test_live_migration_numa(false, true)
}
#[test]
#[cfg(not(feature = "mshv"))]
fn test_live_upgrade_numa() {
_test_live_migration_numa(true, false)
}
#[test]
#[cfg(not(feature = "mshv"))]
fn test_live_upgrade_numa_local() {
_test_live_migration_numa(true, true)
}
// Require to run ovs-dpdk tests sequentially because they rely on the same ovs-dpdk setup
#[test]