github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-06 03:56:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9872 from GabyCT/topic/varmemin

Browse Source 
metrics: Improve variable definition in memory inside containers script
This commit is contained in:
GabyCT 2024-06-24 15:30:05 -06:00 committed by GitHub
commit 27d75f93e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,13 +47,16 @@ function 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
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
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
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.
@ -118,7 +121,8 @@ function main() {
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
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.