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

metrics: Fix double quotes variables in memory usage script

Browse Source 
This PR usses double quotes in all the variables as well as general fixes
to the memory usage script in order to have uniformity.

Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
This commit is contained in:
Gabriela Cervantes 2023-07-04 17:24:55 +00:00
parent 476a11194a
commit b9d66e0d53
1 changed files with 68 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
tests/metrics/density/memory_usage.sh
View File

@ -12,6 +12,7 @@
# This test uses smem tool to get the memory used. # This test uses smem tool to get the memory used.
set -e set -e
set -x
SCRIPT_PATH=$(dirname "$(readlink -f "$0")") SCRIPT_PATH=$(dirname "$(readlink -f "$0")")
source "${SCRIPT_PATH}/../lib/common.bash" source "${SCRIPT_PATH}/../lib/common.bash"
@ -32,7 +33,7 @@ MEM_TMP_FILE=$(mktemp meminfo.XXXXXXXXXX)
PS_TMP_FILE=$(mktemp psinfo.XXXXXXXXXX) PS_TMP_FILE=$(mktemp psinfo.XXXXXXXXXX)
function remove_tmp_file() { function remove_tmp_file() {
rm -rf $MEM_TMP_FILE $PS_TMP_FILE rm -rf "${MEM_TMP_FILE $PS_TMP_FILE}"
} }
trap remove_tmp_file EXIT trap remove_tmp_file EXIT
@ -53,14 +54,14 @@ EOF
get_runc_pss_memory(){ get_runc_pss_memory(){
ctr_runc_shim_path="/usr/local/bin/containerd-shim-runc-v2" ctr_runc_shim_path="/usr/local/bin/containerd-shim-runc-v2"
get_pss_memory "$ctr_runc_shim_path" get_pss_memory "${ctr_runc_shim_path}"
} }
get_runc_individual_memory() { get_runc_individual_memory() {
runc_process_result=$(cat $MEM_TMP_FILE | tr "\n" " " | sed -e 's/\s$//g' | sed 's/ /, /g') runc_process_result=$(cat "${MEM_TMP_FILE}" | tr "\n" " " | sed -e 's/\s$//g' | sed 's/ /, /g')
# Verify runc process result # Verify runc process result
if [ -z "$runc_process_result" ];then if [ -z "${runc_process_result}" ];then
die "Runc process not found" die "Runc process not found"
fi fi
@ -71,7 +72,7 @@ get_runc_individual_memory() {
local json="$(cat << EOF local json="$(cat << EOF
{ {
"runc individual results": [ "runc individual results": [
$(for ((i=0;i<${NUM_CONTAINERS[@]};++i)); do $(for ((i=0;i<"${NUM_CONTAINERS[@]}";++i)); do
printf '%s\n\t\t\t' "${runc_values[i]}" printf '%s\n\t\t\t' "${runc_values[i]}"
done) done)
] ]
@ -90,32 +91,32 @@ get_pss_memory(){
count=0 count=0
avg=0 avg=0
if [ -z "$ps" ]; then if [ -z "${ps}" ]; then
die "No argument to get_pss_memory()" die "No argument to get_pss_memory()"
fi fi
# Save all the processes names # Save all the processes names
# This will be help us to retrieve raw information # This will be help us to retrieve raw information
echo $ps >> $PS_TMP_FILE echo "${ps}" >> "${PS_TMP_FILE}"
data=$(sudo "$SMEM_BIN" --no-header -P "^$ps" -c "pss" | sed 's/[[:space:]]//g') data=$(sudo "${SMEM_BIN}" --no-header -P "^$ps" -c "pss" | sed 's/[[:space:]]//g')
# Save all the smem results # Save all the smem results
# This will help us to retrieve raw information # This will help us to retrieve raw information
echo $data >> $MEM_TMP_FILE echo "${data}" >> "${MEM_TMP_FILE}"
for i in $data;do for i in "${data}"; do
if (( i > 0 ));then if (( i > 0 ));then
mem_amount=$(( i + mem_amount )) mem_amount=$(( i + mem_amount ))
(( count++ )) (( count++ ))
fi fi
done done
if (( $count > 0 ));then if (( "${count}" > 0 ));then
avg=$(bc -l <<< "scale=2; $mem_amount / $count") avg=$(bc -l <<< "scale=2; ${mem_amount} / ${count}")
fi fi
echo "$avg" echo "${avg}"
} }
ppid() { ppid() {
@ -140,26 +141,26 @@ get_pss_memory_virtiofsd() {
die "virtiofsd_path not provided" die "virtiofsd_path not provided"
fi fi
echo "${virtiofsd_path}" >> $PS_TMP_FILE echo "${virtiofsd_path}" >> "${PS_TMP_FILE}"
virtiofsd_pids=$(ps aux | grep [v]irtiofsd | awk '{print $2}') virtiofsd_pids=$(ps aux | grep virtiofsd | awk '{print $2}')
data=$(sudo smem --no-header -P "^${virtiofsd_path}" -c pid -c "pid pss") data=$(sudo smem --no-header -P "^${virtiofsd_path}" -c pid -c "pid pss")
for p in ${virtiofsd_pids}; do for p in "${virtiofsd_pids}"; do
parent_pid=$(ppid ${p}) parent_pid=$(ppid "${p}")
cmd="$(cat /proc/${p}/cmdline | tr -d '\0')" cmd="$(cat /proc/${p}/cmdline | tr -d '\0')"
cmd_parent="$(cat /proc/${parent_pid}/cmdline | tr -d '\0')" cmd_parent="$(cat /proc/${parent_pid}/cmdline | tr -d '\0')"
if [ "${cmd}" != "${cmd_parent}" ]; then if [ "${cmd}" != "${cmd_parent}" ]; then
pss_parent=$(printf "%s" "${data}" | grep "\s^${p}" | awk '{print $2}') pss_parent=$(printf "%s" "${data}" | grep "\s^${p}" | awk '{print $2}')
fork=$(pgrep -P ${p}) fork=$(pgrep -P "${p}")
pss_fork=$(printf "%s" "${data}" | grep "^\s*${fork}" | awk '{print $2}') pss_fork=$(printf "%s" "${data}" | grep "^\s*${fork}" | awk '{print $2}')
pss_process=$((pss_fork + pss_parent)) pss_process=$((pss_fork + pss_parent))
# Save all the smem results # Save all the smem results
# This will help us to retrieve raw information # This will help us to retrieve raw information
echo "${pss_process}" >>$MEM_TMP_FILE echo "${pss_process}" >>"${MEM_TMP_FILE}"
if ((pss_process > 0)); then if ((pss_process > 0)); then
mem_amount=$((pss_process + mem_amount)) mem_amount=$((pss_process + mem_amount))
@ -168,22 +169,22 @@ get_pss_memory_virtiofsd() {
fi fi
done done
if (( $count > 0 ));then if (( "${count}" > 0 ));then
avg=$(bc -l <<< "scale=2; $mem_amount / $count") avg=$(bc -l <<< "scale=2; ${mem_amount} / ${count}")
fi fi
echo "${avg}" echo "${avg}"
} }
get_individual_memory(){ get_individual_memory(){
# Getting all the individual container information # Getting all the individual container information
first_process_name=$(cat $PS_TMP_FILE | awk 'NR==1' | awk -F "/" '{print $NF}' | sed 's/[[:space:]]//g') first_process_name=$(cat "${PS_TMP_FILE}" | awk 'NR==1' | awk -F "/" '{print $NF}' | sed 's/[[:space:]]//g')
first_process_result=$(cat $MEM_TMP_FILE | awk 'NR==1' | sed 's/ /, /g') first_process_result=$(cat "${MEM_TMP_FILE}" | awk 'NR==1' | sed 's/ /, /g')
second_process_name=$(cat $PS_TMP_FILE | awk 'NR==2' | awk -F "/" '{print $NF}' | sed 's/[[:space:]]//g') second_process_name=$(cat "${PS_TMP_FILE}" | awk 'NR==2' | awk -F "/" '{print $NF}' | sed 's/[[:space:]]//g')
second_process_result=$(cat $MEM_TMP_FILE | awk 'NR==2' | sed 's/ /, /g') second_process_result=$(cat "${MEM_TMP_FILE}" | awk 'NR==2' | sed 's/ /, /g')
third_process_name=$(cat $PS_TMP_FILE | awk 'NR==3' | awk -F "/" '{print $NF}' | sed 's/[[:space:]]//g') third_process_name=$(cat "${PS_TMP_FILE}" | awk 'NR==3' | awk -F "/" '{print $NF}' | sed 's/[[:space:]]//g')
third_process_result=$(cat $MEM_TMP_FILE | awk 'NR==3' | sed 's/ /, /g') third_process_result=$(cat "${MEM_TMP_FILE}" | awk 'NR==3' | sed 's/ /, /g')
read -r -a first_values <<< "${first_process_result}" read -r -a first_values <<< "${first_process_result}"
read -r -a second_values <<< "${second_process_result}" read -r -a second_values <<< "${second_process_result}"
@ -193,20 +194,20 @@ get_individual_memory(){
local json="$(cat << EOF local json="$(cat << EOF
{ {
"$first_process_name memory": [ "${first_process_name memory}": [
$(for ((i=0;i<${NUM_CONTAINERS[@]};++i)); do $(for ((i=0;i<"${NUM_CONTAINERS[@]}";++i)); do
[ -n "${first_values[i]}" ] && [ -n "${first_values[i]}" ] &&
printf '%s\n\t\t\t' "${first_values[i]}" printf '%s\n\t\t\t' "${first_values[i]}"
done) done)
], ],
"$second_process_name memory": [ "${second_process_name memory}": [
$(for ((i=0;i<${NUM_CONTAINERS[@]};++i)); do $(for ((i=0;i<"${NUM_CONTAINERS[@]}";++i)); do
[ -n "${second_values[i]}" ] && [ -n "${second_values[i]}" ] &&
printf '%s\n\t\t\t' "${second_values[i]}" printf '%s\n\t\t\t' "${second_values[i]}"
done) done)
], ],
"$third_process_name memory": [ "${third_process_name memory}": [
$(for ((i=0;i<${NUM_CONTAINERS[@]};++i)); do $(for ((i=0;i<"${NUM_CONTAINERS[@]}";++i)); do
[ -n "${third_values[i]}" ] && [ -n "${third_values[i]}" ] &&
printf '%s\n\t\t\t' "${third_values[i]}" printf '%s\n\t\t\t' "${third_values[i]}"
done) done)
@ -227,40 +228,40 @@ get_docker_memory_usage(){
containers=() containers=()
for ((i=1; i<= NUM_CONTAINERS; i++)); do for ((i=1; i<"${NUM_CONTAINERS[@]}"; i++)); do
containers+=($(random_name)) containers+=($(random_name))
${CTR_EXE} run --runtime "${CTR_RUNTIME}" -d ${IMAGE} ${containers[-1]} ${CMD} sudo "${CTR_EXE}" run --runtime "${CTR_RUNTIME}" -d "${IMAGE}" "${containers[-1]}" "${CMD}"
done done
if [ "$AUTO_MODE" == "auto" ]; then if [ "${AUTO_MODE}" == "auto" ]; then
if (( ksm_on != 1 )); then if (( ksm_on != 1 )); then
die "KSM not enabled, cannot use auto mode" die "KSM not enabled, cannot use auto mode"
fi fi
echo "Entering KSM settle auto detect mode..." echo "Entering KSM settle auto detect mode..."
wait_ksm_settle $WAIT_TIME wait_ksm_settle "${WAIT_TIME}"
else else
# If KSM is enabled, then you normally want to sleep long enough to # If KSM is enabled, then you normally want to sleep long enough to
# let it do its work and for the numbers to 'settle'. # let it do its work and for the numbers to 'settle'.
echo "napping $WAIT_TIME s" echo "napping ${WAIT_TIME} s"
sleep "$WAIT_TIME" sleep "${WAIT_TIME}"
fi fi
metrics_json_start_array metrics_json_start_array
# Check the runtime in order in order to determine which process will # Check the runtime in order in order to determine which process will
# be measured about PSS # be measured about PSS
if [ "$RUNTIME" == "runc" ]; then if [ "${RUNTIME}" == "runc" ]; then
runc_workload_mem="$(get_runc_pss_memory)" runc_workload_mem="$(get_runc_pss_memory)"
memory_usage="$runc_workload_mem" memory_usage="${runc_workload_mem}"
local json="$(cat << EOF local json="$(cat << EOF
{ {
"average": { "average": {
"Result": $memory_usage, "Result": ${memory_usage},
"Units" : "KB" "Units" : "KB"
}, },
"runc": { "runc": {
"Result": $runc_workload_mem, "Result": ${runc_workload_mem},
"Units" : "KB" "Units" : "KB"
} }
} }
@ -276,39 +277,39 @@ EOF
# Now if you do not have enough rights # Now if you do not have enough rights
# the smem failure to read the stats will also be trapped. # the smem failure to read the stats will also be trapped.
hypervisor_mem="$(get_pss_memory "$HYPERVISOR_PATH")" hypervisor_mem="$(get_pss_memory "${HYPERVISOR_PATH}")"
if [ "$hypervisor_mem" == "0" ]; then if [ "${hypervisor_mem}" == "0" ]; then
die "Failed to find PSS for $HYPERVISOR_PATH" die "Failed to find PSS for ${HYPERVISOR_PATH}"
fi fi
virtiofsd_mem="$(get_pss_memory_virtiofsd "$VIRTIOFSD_PATH")" virtiofsd_mem="$(get_pss_memory_virtiofsd "${VIRTIOFSD_PATH}")"
if [ "$virtiofsd_mem" == "0" ]; then if [ "${virtiofsd_mem}" == "0" ]; then
echo >&2 "WARNING: Failed to find PSS for $VIRTIOFSD_PATH" echo >&2 "WARNING: Failed to find PSS for ${VIRTIOFSD_PATH}"
fi fi
shim_mem="$(get_pss_memory "$SHIM_PATH")" shim_mem="$(get_pss_memory "${SHIM_PATH}")"
if [ "$shim_mem" == "0" ]; then if [ "${shim_mem}" == "0" ]; then
die "Failed to find PSS for $SHIM_PATH" die "Failed to find PSS for ${SHIM_PATH}"
fi fi
mem_usage="$(bc -l <<< "scale=2; $hypervisor_mem +$virtiofsd_mem + $shim_mem")" mem_usage="$(bc -l <<< "scale=2; ${hypervisor_mem} +${virtiofsd_mem} + ${shim_mem}")"
memory_usage="$mem_usage" memory_usage="${mem_usage}"
local json="$(cat << EOF local json="$(cat << EOF
{ {
"average": { "average": {
"Result": $mem_usage, "Result": ${mem_usage},
"Units" : "KB" "Units" : "KB"
}, },
"qemus": { "qemus": {
"Result": $hypervisor_mem, "Result": ${hypervisor_mem},
"Units" : "KB" "Units" : "KB"
}, },
"virtiofsds": { "virtiofsds": {
"Result": $virtiofsd_mem, "Result": ${virtiofsd_mem},
"Units" : "KB" "Units" : "KB"
}, },
"shims": { "shims": {
"Result": $shim_mem, "Result": ${shim_mem},
"Units" : "KB" "Units" : "KB"
} }
} }
@ -327,12 +328,12 @@ save_config(){
local json="$(cat << EOF local json="$(cat << EOF
{ {
"containers": $NUM_CONTAINERS, "containers": "${NUM_CONTAINERS}",
"ksm": $ksm_on, "ksm": "${ksm_on}",
"auto": "$AUTO_MODE", "auto": "${AUTO_MODE}",
"waittime": $WAIT_TIME, "waittime": "${WAIT_TIME}",
"image": "$IMAGE", "image": "${IMAGE}",
"command": "$CMD" "command": "${CMD}"
} }
EOF EOF
@ -352,10 +353,12 @@ main(){
#Check for KSM before reporting test name, as it can modify it #Check for KSM before reporting test name, as it can modify it
check_for_ksm check_for_ksm
sudo systemctl restart containerd
init_env init_env
check_cmds "${SMEM_BIN}" bc check_cmds "${SMEM_BIN}" bc
check_images "$IMAGE" check_images "${IMAGE}"
if [ "${CTR_RUNTIME}" == "io.containerd.kata.v2" ]; then if [ "${CTR_RUNTIME}" == "io.containerd.kata.v2" ]; then
export RUNTIME="kata-runtime" export RUNTIME="kata-runtime"