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

tests: restart systemd daemon to reload systemd configuration

Browse source 
Currently, the watchdog configuration in systemd is reloaded by
reboot. We can cancel this reboot operation by restarting the
systemd daemon process.

Signed-off-by: Songqian Li <sionli@tencent.com>
This commit is contained in:
Songqian Li 2024-05-14 20:11:31 +08:00 • committed by Rob Bradford
parent 6c4947e9ba
commit de38e4b777
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/integration.rs
View file

@ -2331,6 +2331,8 @@ fn enable_guest_watchdog(guest: &Guest, watchdog_sec: u32) {
"echo RuntimeWatchdogSec={watchdog_sec}s | sudo tee -a /etc/systemd/system.conf" "echo RuntimeWatchdogSec={watchdog_sec}s | sudo tee -a /etc/systemd/system.conf"
)) ))
.unwrap(); .unwrap();
guest.ssh_command("sudo systemctl daemon-reexec").unwrap();
} }
fn make_guest_panic(guest: &Guest) { fn make_guest_panic(guest: &Guest) {
@ -6140,10 +6142,6 @@ mod common_parallel {
// Enable the watchdog with a 15s timeout // Enable the watchdog with a 15s timeout
enable_guest_watchdog(&guest, 15); enable_guest_watchdog(&guest, 15);
// Reboot and check that systemd has activated the watchdog
guest.ssh_command("sudo reboot").unwrap();
guest.wait_vm_boot(None).unwrap();
expected_reboot_count += 1;
assert_eq!(get_reboot_count(&guest), expected_reboot_count); assert_eq!(get_reboot_count(&guest), expected_reboot_count);
assert_eq!( assert_eq!(
guest guest
@ -6152,7 +6150,7 @@ mod common_parallel {
.trim() .trim()
.parse::<u32>() .parse::<u32>()
.unwrap_or_default(), .unwrap_or_default(),
2 1
); );
// Allow some normal time to elapse to check we don't get spurious reboots // Allow some normal time to elapse to check we don't get spurious reboots
@ -9727,13 +9725,10 @@ mod live_migration {
} }
// Enable watchdog and ensure its functional // Enable watchdog and ensure its functional
let mut expected_reboot_count = 1; let expected_reboot_count = 1;
// Enable the watchdog with a 15s timeout // Enable the watchdog with a 15s timeout
enable_guest_watchdog(&guest, 15); enable_guest_watchdog(&guest, 15);
// Reboot and check that systemd has activated the watchdog
guest.ssh_command("sudo reboot").unwrap();
guest.wait_vm_boot(None).unwrap();
expected_reboot_count += 1;
assert_eq!(get_reboot_count(&guest), expected_reboot_count); assert_eq!(get_reboot_count(&guest), expected_reboot_count);
assert_eq!( assert_eq!(
guest guest
@ -9742,7 +9737,7 @@ mod live_migration {
.trim() .trim()
.parse::<u32>() .parse::<u32>()
.unwrap_or_default(), .unwrap_or_default(),
2 1
); );
// Allow some normal time to elapse to check we don't get spurious reboots // Allow some normal time to elapse to check we don't get spurious reboots
thread::sleep(std::time::Duration::new(40, 0)); thread::sleep(std::time::Duration::new(40, 0));
@ -9795,7 +9790,7 @@ mod live_migration {
guest.check_devices_common(None, Some(&console_text), Some(&pmem_path)); guest.check_devices_common(None, Some(&console_text), Some(&pmem_path));
// Perform checks on watchdog // Perform checks on watchdog
let mut expected_reboot_count = 2; let mut expected_reboot_count = 1;
// Allow some normal time to elapse to check we don't get spurious reboots // Allow some normal time to elapse to check we don't get spurious reboots
thread::sleep(std::time::Duration::new(40, 0)); thread::sleep(std::time::Duration::new(40, 0));