From: Mikhail Pershin <mpershin@whamcloud.com>
Date: Mon, 16 Dec 2019 18:16:24 +0000 (+0300)
Subject: LU-10664 tests: fix MPI tests in dom-performance.sh
X-Git-Tag: 2.13.52~103
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=b6443b3799622f3e281b087f6cf0c86432887846

LU-10664 tests: fix MPI tests in dom-performance.sh

Make MPI tests in dom-performance.sh to be ran under
mpiuser instead of root

Test-Parameters: trivial mdssizegb=20 testlist=dom-performance
Signed-off-by: Mikhail Pershin <mpershin@whamcloud.com>
Change-Id: Ief3036434191a0bc153d5c8e380183d5e5067dc4
Reviewed-on: https://review.whamcloud.com/37044
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/dom-performance.sh b/lustre/tests/dom-performance.sh
index 5b1eec8..98d454c 100644
--- a/lustre/tests/dom-performance.sh
+++ b/lustre/tests/dom-performance.sh
@@ -25,9 +25,16 @@ FAIL_ON_ERROR=false
 
 SAVED_DEBUG=$($LCTL get_param -n debug 2> /dev/null)
 
-check_and_setup_lustre
 
+. $LUSTRE/tests/functions.sh
 build_test_filter
+check_and_setup_lustre
+
+# if MACHINEFILE set and exists -- use it
+MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh)-$(hostname).machines}
+clients=${CLIENTS:-$HOSTNAME}
+generate_machine_file $clients $MACHINEFILE ||
+	error "Failed to generate machine file"
 
 DP_DIO=${DP_DIO:-"no"}
 
@@ -143,10 +150,12 @@ run_MDtest() {
 	local th_num=$((DP_FNUM * 2 / DP_NUM))
 	local bsizes="8192"
 
+	chmod 0777 $TDIR
+
 	[ "$SLOW" = "yes" ] && bsizes="4096 32768"
 
 	for bsize in $bsizes ; do
-		dp_run_cmd "mpirun -np $DP_NUM $mdtest -i 3 -I $th_num -F \
+		dp_run_cmd "mpi_run -np $DP_NUM $mdtest -i 3 -I $th_num -F \
 			-z 1 -b 1 -L -u -w $bsize -R -d $TDIR"
 		if [ ${PIPESTATUS[0]} != 0 ]; then
 			error "MDtest failed, aborting"
@@ -220,23 +229,28 @@ run_IOR() {
 	fi
 
 	local TDIR=${1:-$MOUNT}
+
+	chmod 0777 $TDIR
+
 	local bsizes="8"
 	[ "$SLOW" = "yes" ] && bsizes="4 32"
 
 	for bsize in $bsizes ; do
 		segments=$((128 / bsize))
 
-		dp_run_cmd "mpirun -np $DP_NUM $IOR \
+		dp_run_cmd "mpi_run -np $DP_NUM $IOR \
 			-a POSIX -b ${bsize}K -t ${bsize}K -o $TDIR/ -k \
-			-s $segments -w -r -i $iter -F -E -z -m -Z $direct"
+			-s $segments -w -r -i $iter -F -E -z -m -Z $direct" |
+			awk '($1 !~ /^(write|read|access)$/) || NF>12 {print}'
 		if [ ${PIPESTATUS[0]} != 0 ]; then
 			error "IOR write test for ${bsize}K failed, aborting"
 		fi
 
 		# check READ performance only (no cache)
-		dp_run_cmd "mpirun -np $DP_NUM $IOR \
+		dp_run_cmd "mpi_run -np $DP_NUM $IOR \
 			-a POSIX -b ${bsize}K -t ${bsize}K -o $TDIR/ -X 42\
-			-s $segments -r -i $iter -F -E -z -m -Z $direct"
+			-s $segments -r -i $iter -F -E -z -m -Z $direct" |
+			awk '($1 !~ /^(read|access|remove)$/) || NF>12 {print}'
 		if [ ${PIPESTATUS[0]} != 0 ]; then
 			error "IOR read test for ${bsize}K failed, aborting"
 		fi