github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

metrics: stop hypervirsor and shim at init_env stage

Browse Source 
This PR kills the hypervisor and the kata shim in the
init_env stage prior to launch any metric test.
Additionally this PR adds info messages in the main blocks
of the blogbench test to help in debugging.

Fixes: #7366

Signed-off-by: David Esparza <david.esparza.borquez@intel.com>
This commit is contained in:
David Esparza 2023-07-18 11:26:51 -06:00
parent 7729d82e6e
commit 55e2f0955b
No known key found for this signature in database
GPG Key ID: EABE0B1A98CC3B7A
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/common.bash
View File

@ -181,7 +181,32 @@ function clean_env_ctr()
count_tasks="$(sudo ctr t list -q | wc -l)" count_tasks="$(sudo ctr t list -q | wc -l)"
if (( count_tasks > 0 )); then if (( count_tasks > 0 )); then
die "Can't remove running contaienrs." die "Can't remove running containers."
fi
kill_kata_components
}
# Kills running shim and hypervisor components
function kill_kata_components() {
local kata_bin_dir="/opt/kata/bin"
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
if [ "${KATA_HYPERVISOR}" = 'clh' ]; then
hypervisor_path="${kata_bin_dir}/cloud-hypervisor"
elif [ "${KATA_HYPERVISOR}" != 'qemu' ]; then
echo "Failed to stop the hypervisor: '${KATA_HYPERVISOR}' as it is not recognized"
return
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 fi
} }

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

@ -178,6 +178,7 @@ function init_env()
# This clean up is more aggressive, this is in order to # This clean up is more aggressive, this is in order to
# decrease the factors that could affect the metrics results. # decrease the factors that could affect the metrics results.
kill_processes_before_start kill_processes_before_start
info "init environment complete"
} }
# This function checks if there are containers or # This function checks if there are containers or

2
tests/metrics/storage/blogbench.sh
View File

@ -39,6 +39,7 @@ function main() {
sudo systemctl restart containerd sudo systemctl restart containerd
metrics_json_init metrics_json_init
info "Running Blogbench test"
local output=$(sudo -E ${CTR_EXE} run --rm --runtime=${CTR_RUNTIME} ${IMAGE} test ${CMD}) local output=$(sudo -E ${CTR_EXE} run --rm --runtime=${CTR_RUNTIME} ${IMAGE} test ${CMD})
# Save configuration # Save configuration
@ -66,6 +67,7 @@ EOF
metrics_json_end_array "Config" metrics_json_end_array "Config"
# Save results # Save results
info "Saving Blogbench results"
metrics_json_start_array metrics_json_start_array
local writes=$(tail -2 <<< "${output}" | head -1 | awk '{print $5}') local writes=$(tail -2 <<< "${output}" | head -1 | awk '{print $5}')