github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 13:14:33 +00:00
Code Issues Projects Releases Wiki Activity

metrics: Clean kata components before start a metric test.

Browse Source 
This PR kills all kata components before start a new
metric test.

Fixes: #7528

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

29
tests/common.bash
View File

@ -186,31 +186,20 @@ function clean_env_ctr()
if (( count_tasks > 0 )); then if (( count_tasks > 0 )); then
die "Can't remove running containers." die "Can't remove running containers."
fi fi
kill_kata_components
} }
# 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 kata_bin_dir="/opt/kata/bin" local PID_NAMES=( "containerd-shim-kata-v2" "qemu-system-x86_64" "cloud-hypervisor" )
local shim_path="${kata_bin_dir}/containerd-shim-kata-v2"
local hypervisor_path="${kata_bin_dir}/qemu-system-x86_64"
local pid_shim_count="$(pgrep -fc ${shim_path} || exit 0)"
[ ${pid_shim_count} -gt "0" ] && sudo kill -SIGKILL "$(pgrep -f ${shim_path})" > /dev/null 2>&1 sudo systemctl stop containerd
# Get the filenames of the kata components
if [ "${KATA_HYPERVISOR}" = 'clh' ]; then # and kill the correspondingt processes
hypervisor_path="${kata_bin_dir}/cloud-hypervisor" for PID_NAME in ${PID_NAMES} ; do
elif [ "${KATA_HYPERVISOR}" != 'qemu' ]; then sudo killall ${PID_NAME} > /dev/null 2>&1 || true
echo "Failed to stop the hypervisor: '${KATA_HYPERVISOR}' as it is not recognized" done
return sudo systemctl start containerd
fi
local pid_hypervisor_count="$(pgrep -fc ${hypervisor_path} || exit 0)"
if [ ${pid_hypervisor_count} -gt "0" ]; then
sudo kill -SIGKILL "$(pgrep -f ${hypervisor_path})" > /dev/null 2>&1
fi
} }
# 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.

2
tests/metrics/lib/common.bash
View File

@ -192,6 +192,8 @@ function kill_processes_before_start()
CTR_PROCS=$(sudo "${CTR_EXE}" t list -q) CTR_PROCS=$(sudo "${CTR_EXE}" t list -q)
[[ -n "${CTR_PROCS}" ]] && clean_env_ctr [[ -n "${CTR_PROCS}" ]] && clean_env_ctr
kill_kata_components
check_processes check_processes
} }