External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-07 10:15:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Improve test_live_migration_numa

Browse Source 
Set various initial memory node sizes in test case
`test_live_migration_numa`.

Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao 2022-04-01 18:03:26 +08:00 committed by Xin Wang
parent 9069cc889f
commit 261e39d8ab
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/integration.rs
View File

@ -7285,7 +7285,7 @@ mod live_migration {
"--memory-zone", "--memory-zone",
"id=mem0,size=1G,hotplug_size=32G", "id=mem0,size=1G,hotplug_size=32G",
"id=mem1,size=1G,hotplug_size=32G", "id=mem1,size=1G,hotplug_size=32G",
"id=mem2,size=1G,hotplug_size=32G", "id=mem2,size=2G,hotplug_size=32G",
"--numa", "--numa",
"guest_numa_id=0,cpus=[0-2,9],distances=[1@15,2@20],memory_zones=mem0", "guest_numa_id=0,cpus=[0-2,9],distances=[1@15,2@20],memory_zones=mem0",
"guest_numa_id=1,cpus=[3-4,6-8],distances=[0@20,2@25],memory_zones=mem1", "guest_numa_id=1,cpus=[3-4,6-8],distances=[0@20,2@25],memory_zones=mem1",
@ -7336,7 +7336,7 @@ mod live_migration {
// virtio-mem regions being used. // virtio-mem regions being used.
if numa { if numa {
guest.check_numa_common( guest.check_numa_common(
Some(&[960_000, 960_000, 960_000]), Some(&[960_000, 960_000, 1_920_000]),
Some(&[vec![0, 1, 2], vec![3, 4], vec![5]]), Some(&[vec![0, 1, 2], vec![3, 4], vec![5]]),
Some(&["10 15 20", "20 10 25", "25 30 10"]), Some(&["10 15 20", "20 10 25", "25 30 10"]),
); );
@ -7351,7 +7351,7 @@ mod live_migration {
// has been assigned the right amount of memory. // has been assigned the right amount of memory.
resize_zone_command(&src_api_socket, "mem0", "2G"); resize_zone_command(&src_api_socket, "mem0", "2G");
resize_zone_command(&src_api_socket, "mem1", "2G"); resize_zone_command(&src_api_socket, "mem1", "2G");
resize_zone_command(&src_api_socket, "mem2", "2G"); resize_zone_command(&src_api_socket, "mem2", "3G");
thread::sleep(std::time::Duration::new(5, 0)); thread::sleep(std::time::Duration::new(5, 0));
guest.check_numa_common(Some(&[1_920_000, 1_920_000, 1_920_000]), None, None); guest.check_numa_common(Some(&[1_920_000, 1_920_000, 1_920_000]), None, None);
@ -7509,9 +7509,9 @@ mod live_migration {
assert_eq!(guest.get_cpu_count().unwrap_or_default(), 6); assert_eq!(guest.get_cpu_count().unwrap_or_default(), 6);
if numa { if numa {
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
assert!(guest.get_total_memory().unwrap_or_default() > 5_760_000); assert!(guest.get_total_memory().unwrap_or_default() > 6_720_000);
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
assert!(guest.get_total_memory().unwrap_or_default() > 2_880_000); assert!(guest.get_total_memory().unwrap_or_default() > 3_840_000);
} else { } else {
assert!(guest.get_total_memory().unwrap_or_default() > 3_840_000); assert!(guest.get_total_memory().unwrap_or_default() > 3_840_000);
} }
@ -7522,7 +7522,7 @@ mod live_migration {
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
{ {
guest.check_numa_common( guest.check_numa_common(
Some(&[960_000, 960_000, 960_000]), Some(&[960_000, 960_000, 1_920_000]),
Some(&[vec![0, 1, 2], vec![3, 4], vec![5]]), Some(&[vec![0, 1, 2], vec![3, 4], vec![5]]),
Some(&["10 15 20", "20 10 25", "25 30 10"]), Some(&["10 15 20", "20 10 25", "25 30 10"]),
); );
@ -7533,7 +7533,7 @@ mod live_migration {
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
{ {
guest.check_numa_common( guest.check_numa_common(
Some(&[1_920_000, 1_920_000, 1_920_000]), Some(&[1_920_000, 1_920_000, 2_880_000]),
Some(&[vec![0, 1, 2], vec![3, 4], vec![5]]), Some(&[vec![0, 1, 2], vec![3, 4], vec![5]]),
Some(&["10 15 20", "20 10 25", "25 30 10"]), Some(&["10 15 20", "20 10 25", "25 30 10"]),
); );