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 <c17830@cray.com>
Change-Id: I667efd58004fbe02e79b3c02032133ea41f5337b
Test-Parameters: testlist=racer
Reviewed-on: https://review.whamcloud.com/33831
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Elena Gryaznova <c17455@cray.com>
Reviewed-by: Alexandr Boyko <c17825@cray.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/racer.sh b/lustre/tests/racer.sh
index 0510b08..550624f 100644 (file)
--- 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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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
 }