github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 12:44:39 +00:00
Code Issues Projects Releases Wiki Activity

metrics: fix the loop used to stop kata components #7629

Browse Source 
This PR fixed the loop that stops the kata-shim and the
hypervisors used in metrics checks.

Fixes: #7628

Signed-off-by: David Esparza <david.esparza.borquez@intel.com>
This commit is contained in:
David Esparza 2023-08-11 12:25:57 -06:00
parent a39fd6c066
commit 767434d50a
No known key found for this signature in database
GPG Key ID: EABE0B1A98CC3B7A
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/common.bash
View File

@ -189,17 +189,16 @@ function clean_env_ctr()
} }
# Kills running shim and hypervisor components # Kills running shim and hypervisor components
# by using the kata-component file name.
function kill_kata_components() { function kill_kata_components() {
local TIMEOUT="30s"
local PID_NAMES=( "containerd-shim-kata-v2" "qemu-system-x86_64" "cloud-hypervisor" ) local PID_NAMES=( "containerd-shim-kata-v2" "qemu-system-x86_64" "cloud-hypervisor" )
sudo systemctl stop containerd sudo systemctl stop containerd
# Get the filenames of the kata components # iterate over the list of kata components and stop them
# and kill the correspondingt processes for PID_NAME in "${PID_NAMES[@]}"; do
for PID_NAME in ${PID_NAMES} ; do [[ ! -z "$(pidof ${PID_NAME})" ]] && sudo killall "${PID_NAME}" > /dev/null 2>&1 || true
sudo killall ${PID_NAME} > /dev/null 2>&1 || true
done done
sudo systemctl start containerd sudo timeout -s SIGKILL "${TIMEOUT}" systemctl start containerd
} }
# Restarts a systemd service while ensuring the start-limit-burst is set to 0. # Restarts a systemd service while ensuring the start-limit-burst is set to 0.