From 767434d50a4137b92b5b161fa662c8ea5db25dd6 Mon Sep 17 00:00:00 2001 From: David Esparza Date: Fri, 11 Aug 2023 12:25:57 -0600 Subject: [PATCH] metrics: fix the loop used to stop kata components #7629 This PR fixed the loop that stops the kata-shim and the hypervisors used in metrics checks. Fixes: #7628 Signed-off-by: David Esparza --- tests/common.bash | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/common.bash b/tests/common.bash index 295ac8c5cf..bdb63c77cc 100644 --- a/tests/common.bash +++ b/tests/common.bash @@ -189,17 +189,16 @@ function clean_env_ctr() } # Kills running shim and hypervisor components -# by using the kata-component file name. function kill_kata_components() { + local TIMEOUT="30s" local PID_NAMES=( "containerd-shim-kata-v2" "qemu-system-x86_64" "cloud-hypervisor" ) sudo systemctl stop containerd - # Get the filenames of the kata components - # and kill the correspondingt processes - for PID_NAME in ${PID_NAMES} ; do - sudo killall ${PID_NAME} > /dev/null 2>&1 || true + # iterate over the list of kata components and stop them + for PID_NAME in "${PID_NAMES[@]}"; do + [[ ! -z "$(pidof ${PID_NAME})" ]] && sudo killall "${PID_NAME}" > /dev/null 2>&1 || true 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.