From 15e31017dd83403b1b28b629985408068902bef2 Mon Sep 17 00:00:00 2001
From: Michal Berger <michal.berger@intel.com>
Date: Thu, 19 Jan 2023 16:16:11 +0100
Subject: [PATCH] autotest: Refactor reap_spdk_processes()

This is done in order to speed up entire lookup and be more robust
with matching target processes. This implementation also tries to
detect processes executed outside of the local repo workspace - this
is most relevant for the CI where lingering processes may come from
different jenkins workspaces (i.e. executed by different jobs).

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: Id4f62302701f064ad00906497379e16ff8c04993
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16356
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 test/common/autotest_common.sh | 63 ++++++++++++++--------------------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index a663391ed..bc09157d8 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -1544,51 +1544,40 @@ function pap() {
 }
 
 function get_proc_paths() {
-	local procs proc
-	if [[ $(uname -s) == Linux ]]; then
-		for proc in /proc/[0-9]*; do
-			[[ -e $proc/exe ]] || continue
-			procs[${proc##*/}]=$(readlink -f "$proc/exe")
-		done
-	elif [[ $(uname -s) == FreeBSD ]]; then
-		while read -r proc _ _ path; do
-			[[ -e $path ]] || continue
-			procs[proc]=$path
-		done < <(procstat -ab)
-	fi
-
-	for proc in "${!procs[@]}"; do
-		echo "$proc" "${procs[proc]}"
-	done
+	case "$(uname -s)" in
+		Linux) # ps -e -opid,exe <- not supported under {centos7,rocky8}'s procps-ng
+			local pid
+			for pid in /proc/[0-9]*; do
+				[[ -e $pid/exe ]] || continue
+				echo "${pid##*/} $(readlink -f "$pid/exe")"
+			done
+			;;
+		FreeeBSD) procstat -ab | awk '{print $1, $4}' ;;
+	esac
 }
 
-is_exec_file() { [[ -f $1 && $(file "$1") =~ ELF.+executable ]]; }
+exec_files() { file "$@" | awk -F: '/ELF.+executable/{print $1}'; }
 
 function reap_spdk_processes() {
-	local bins bin
-	local misc_bins
+	local bins test_bins procs
+	local spdk_procs spdk_pids
 
-	while read -r bin; do
-		is_exec_file "$bin" && misc_bins+=("$bin")
-	done < <(find "$rootdir"/test/{app,env,event} -type f)
+	mapfile -t test_bins < <(find "$rootdir"/test/{app,env,event} -type f)
+	mapfile -t bins < <(
+		exec_files "${test_bins[@]}"
+		readlink -f "$SPDK_BIN_DIR/"* "$SPDK_EXAMPLE_DIR/"*
+	)
 
-	mapfile -t bins < <(readlink -f "$SPDK_BIN_DIR/"* "$SPDK_EXAMPLE_DIR/"* "${misc_bins[@]}")
+	mapfile -t spdk_procs < <(get_proc_paths | grep -E "$(
+		IFS="|"
+		echo "${bins[*]#$rootdir/}"
+	)" || true)
+	((${#spdk_procs[@]} > 0)) || return 0
 
-	local spdk_pid spdk_pids path
-	while read -r spdk_pid path; do
-		if [[ ${bins[*]/$path/} != "${bins[*]}" ]]; then
-			echo "$path is still up ($spdk_pid), killing"
-			spdk_pids[spdk_pid]=$path
-		fi
-	done < <(get_proc_paths)
-
-	((${#spdk_pids[@]} > 0)) || return 0
-
-	kill -SIGTERM "${!spdk_pids[@]}" 2> /dev/null || :
-	# Wait a bit and then use the stick
-	sleep 2
-	kill -SIGKILL "${!spdk_pids[@]}" 2> /dev/null || :
+	printf '%s is still up, killing\n' "${spdk_procs[@]}" >&2
+	mapfile -t spdk_pids < <(printf '%s\n' "${spdk_procs[@]}" | awk '{print $1}')
 
+	kill -SIGKILL "${spdk_pids[@]}" 2> /dev/null || :
 	return 1
 }