From 5e71c2963f3f2a8bcdec39c41f0448e9d5bb78be Mon Sep 17 00:00:00 2001 From: Vladimir Saveliev Date: Fri, 14 Dec 2018 19:59:38 +0300 Subject: [PATCH] LU-11759 tests: racer cleanup 1. set LCTL in do_nodes $clients $racer so that lustre_build_version worked correctly 2. list processes for ps -C properly 3. clear trap ERR in racer routines which sources test-framework.sh Cray-bug-id: LUS-6592 Signed-off-by: Vladimir Saveliev Change-Id: I667efd58004fbe02e79b3c02032133ea41f5337b Test-Parameters: testlist=racer Reviewed-on: https://review.whamcloud.com/33831 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Elena Gryaznova Reviewed-by: Alexandr Boyko Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/racer.sh | 1 + lustre/tests/racer/lss_create.sh | 1 + lustre/tests/racer/lss_destroy.sh | 1 + lustre/tests/racer/racer.sh | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lustre/tests/racer.sh b/lustre/tests/racer.sh index 0510b08..550624f 100644 --- a/lustre/tests/racer.sh +++ b/lustre/tests/racer.sh @@ -98,6 +98,7 @@ test_1() { RACER_ENABLE_DOM=$RACER_ENABLE_DOM \ RACER_ENABLE_FLR=$RACER_ENABLE_FLR \ LFS=$LFS \ + LCTL=$LCTL \ $racer $rdir $NUM_RACER_THREADS" & pid=$! rpids="$rpids $pid" diff --git a/lustre/tests/racer/lss_create.sh b/lustre/tests/racer/lss_create.sh index ff530f0..8f950f4 100755 --- a/lustre/tests/racer/lss_create.sh +++ b/lustre/tests/racer/lss_create.sh @@ -3,6 +3,7 @@ trap 'kill $(jobs -p)' EXIT LUSTRE=${LUSTRE:-$(cd $(dirname $0)/../..; echo $PWD)} . $LUSTRE/tests/test-framework.sh +trap - ERR . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} while /bin/true; do diff --git a/lustre/tests/racer/lss_destroy.sh b/lustre/tests/racer/lss_destroy.sh index 72135b4..23816ca 100755 --- a/lustre/tests/racer/lss_destroy.sh +++ b/lustre/tests/racer/lss_destroy.sh @@ -3,6 +3,7 @@ trap 'kill $(jobs -p)' EXIT LUSTRE=${LUSTRE:-$(cd $(dirname $0)/../..; echo $PWD)} . $LUSTRE/tests/test-framework.sh +trap - ERR . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} while /bin/true; do diff --git a/lustre/tests/racer/racer.sh b/lustre/tests/racer/racer.sh index fc6ceb8..9fb4105 100755 --- a/lustre/tests/racer/racer.sh +++ b/lustre/tests/racer/racer.sh @@ -47,14 +47,14 @@ racer_cleanup() done if [[ $rc -eq 0 ]]; then echo there should be NO racer processes: - ps uww -C "${RACER_PROGS// /,}" + ps uww -C "${RACER_PROGS// /.sh,}.sh" return 0 fi echo -n "Waited $(( TOT_WAIT + SHORT_WAIT)), rc=$rc " (( SHORT_WAIT+=SHORT_WAIT )) (( TOT_WAIT+=SHORT_WAIT )) done - ps uww -C "${RACER_PROGS// /,}" + ps uww -C "${RACER_PROGS// /.sh,}.sh" return 1 } -- 1.8.3.1