github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-06 22:23:26 +00:00
Code Issues Projects Releases Wiki Activity

metrics: Enable memory inside container metrics

Browse Source 
This PR will enable the memory inside container metrics for the Kata CI.

Fixes #7254

Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
This commit is contained in:
Gabriela Cervantes 2023-07-06 17:07:42 +00:00
parent b7c58320a5
commit 6c68924230
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/metrics/density/memory_usage_inside_container.sh
View File

@ -9,6 +9,7 @@
# is measured by using /proc/meminfo. # is measured by using /proc/meminfo.
set -e set -e
set -x
# General env # General env
SCRIPT_PATH=$(dirname "$(readlink -f "$0")") SCRIPT_PATH=$(dirname "$(readlink -f "$0")")
@ -20,7 +21,7 @@ IMAGE='quay.io/prometheus/busybox:latest'
CMD="sleep 10; cat /proc/meminfo" CMD="sleep 10; cat /proc/meminfo"
# We specify here in 'k', as that then matches the results we get from the meminfo, # We specify here in 'k', as that then matches the results we get from the meminfo,
# which makes later direct comparison easier. # which makes later direct comparison easier.
MEMSIZE=${MEMSIZE:-$((2048*1024))} MEMSIZE="${MEMSIZE:-$((2048*1024))}"
# this variable determines the number of attempts when a test # this variable determines the number of attempts when a test
# result is considered not valid (a zero value or a negative value) # result is considered not valid (a zero value or a negative value)
@ -47,20 +48,20 @@ parse_results() {
local memfree_acu="${3:-0}" local memfree_acu="${3:-0}"
local memavailable_acu="${4:-0}" local memavailable_acu="${4:-0}"
local memtotal=$(echo "$raw_results" | awk '/MemTotal/ {print $2}') local memtotal=$(echo "${raw_results}" | awk '/MemTotal/ {print $2}')
units_memtotal=$(echo "$raw_results" | awk '/MemTotal/ {print $3}') units_memtotal=$(echo "${raw_results}" | awk '/MemTotal/ {print $3}')
local memfree=$(echo "$raw_results" | awk '/MemFree/ {print $2}') local memfree=$(echo "${raw_results}" | awk '/MemFree/ {print $2}')
units_memfree=$(echo "$raw_results" | awk '/MemFree/ {print $3}') units_memfree=$(echo "${raw_results}" | awk '/MemFree/ {print $3}')
local memavailable=$(echo "$raw_results" | awk '/MemAvailable/ {print $2}') local memavailable=$(echo "${raw_results}" | awk '/MemAvailable/ {print $2}')
units_memavailable=$(echo "$raw_results" | awk '/MemAvailable/ {print $3}') units_memavailable=$(echo "${raw_results}" | awk '/MemAvailable/ {print $3}')
# check results: if any result is zero or negative, it is considered as invalid, and the test will be repeated. # check results: if any result is zero or negative, it is considered as invalid, and the test will be repeated.
if (( $(echo "$memtotal <= 0" | bc -l) )) || (( $(echo "$memfree <= 0" | bc -l) )) || (( $(echo "$memavailable <= 0" | bc -l) )); then if (( $(echo "${memtotal} <= 0" | bc -l) )) || (( $(echo "${memfree} <= 0" | bc -l) )) || (( $(echo "${memavailable} <= 0" | bc -l) )); then
MAX_FAILED_ATTEMPTS=$((MAX_FAILED_ATTEMPTS-1)) MAX_FAILED_ATTEMPTS=$((MAX_FAILED_ATTEMPTS-1))
valid_result=0 valid_result=0
info "Skipping invalid result: memtotal: $memtotal memfree: $memfree memavailable: $memavailable" info "Skipping invalid result: memtotal: ${memtotal} memfree: ${memfree} memavailable: ${memavailable}"
return 0 return 0
fi fi
@ -68,14 +69,14 @@ parse_results() {
memfreeAvg=$((memfree+memfree_acu)) memfreeAvg=$((memfree+memfree_acu))
memavailableAvg=$((memavailable+memavailable_acu)) memavailableAvg=$((memavailable+memavailable_acu))
valid_result=1 valid_result=1
info "Iteration# $count_iters memtotal: $memtotal memfree: $memfree memavailable: $memavailable" info "Iteration# ${count_iters} memtotal: ${memtotal} memfree: ${memfree} memavailable: ${memavailable}"
} }
store_results_json() { store_results_json() {
metrics_json_start_array metrics_json_start_array
memtotalAvg=$(echo "scale=2; $memtotalAvg / $count_iters" | bc) memtotalAvg=$(echo "scale=2; ${memtotalAvg} / ${count_iters}" | bc)
memfreeAvg=$(echo "scale=2; $memfreeAvg / $count_iters" | bc) memfreeAvg=$(echo "scale=2; ${memfreeAvg} / ${count_iters}" | bc)
memavailableAvg=$(echo "scale=2; $memavailableAvg / $count_iters" | bc) memavailableAvg=$(echo "scale=2; ${memavailableAvg} / ${count_iters}" | bc)
local json="$(cat << EOF local json="$(cat << EOF
{ {
@ -109,7 +110,7 @@ EOF
function main() { function main() {
# switch to select output format # switch to select output format
local num_iterations=${1:-1} local num_iterations=${1:-1}
info "Iterations: $num_iterations" info "Iterations: ${num_iterations}"
# Check tools/commands dependencies # Check tools/commands dependencies
cmds=("awk" "ctr") cmds=("awk" "ctr")
@ -117,13 +118,13 @@ function main() {
check_cmds "${cmds[@]}" check_cmds "${cmds[@]}"
check_images "${IMAGE}" check_images "${IMAGE}"
metrics_json_init metrics_json_init
while [ $count_iters -lt $num_iterations ]; do while [ "${count_iters}" -lt "${num_iterations}" ]; do
local output=$(sudo -E "${CTR_EXE}" run --memory-limit $((MEMSIZE*1024)) --rm --runtime=$CTR_RUNTIME $IMAGE busybox sh -c "$CMD" 2>&1) local output=$(sudo -E "${CTR_EXE}" run --memory-limit $((MEMSIZE*1024)) --rm --runtime="${CTR_RUNTIME}" "${IMAGE}" busybox sh -c "${CMD}" 2>&1)
parse_results "${output}" "${memtotalAvg}" "${memfreeAvg}" "${memavailableAvg}" parse_results "${output}" "${memtotalAvg}" "${memfreeAvg}" "${memavailableAvg}"
# quit if number of attempts exceeds the allowed value. # quit if number of attempts exceeds the allowed value.
[ ${MAX_FAILED_ATTEMPTS} -eq 0 ] && die "Max number of attempts exceeded." [ "${MAX_FAILED_ATTEMPTS}" -eq 0 ] && die "Max number of attempts exceeded."
[ ${valid_result} -eq 1 ] && count_iters=$((count_iters+1)) [ "${valid_result}" -eq 1 ] && count_iters=$((count_iters+1))
done done
store_results_json store_results_json
clean_env_ctr clean_env_ctr

2
tests/metrics/gha-run.sh
View File

@ -127,8 +127,6 @@ function run_test_memory_usage() {
function run_test_memory_usage_inside_container() { function run_test_memory_usage_inside_container() {
info "Running memory-usage inside the container test using ${KATA_HYPERVISOR} hypervisor" info "Running memory-usage inside the container test using ${KATA_HYPERVISOR} hypervisor"
# ToDo: remove the exit once the metrics workflow is stable
exit 0
create_symbolic_links create_symbolic_links
bash tests/metrics/density/memory_usage_inside_container.sh 5 bash tests/metrics/density/memory_usage_inside_container.sh 5
} }