LU-13267 tests: improve racer cleanup

Add RACER_MAX_CLEANUP_WAIT parameter to specify
timeout for racer cleanup to avoid long waiting in case which
racer processes went non-killable.

Loop in racer_cleanup() contains inaccuracy which made the loop
to sleep less that it was supposed to. Fix it.

Test-Parameters: trivial testlist=racer
Cray-bug-id: LUS-8498
Signed-off-by: Elena Gryaznova <elena.gryaznova@hpe.com>
Reviewed-by: Vladimir Saveliev <vladimir.saveliev@hpe.com>
Reviewed-by: Andriy Skulysh <andriy.skulysh@hpe.com>
Change-Id: I32dac8bc11ef2041a1a580054c2782780bb5980e
Reviewed-on: https://review.whamcloud.com/37638
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Andriy Skulysh <c17819@cray.com>
Reviewed-by: Vladimir Saveliev <c17830@cray.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/racer.sh b/lustre/tests/racer.sh
index 33d0500..f3e855f 100644 (file)
--- a/lustre/tests/racer.sh
+++ b/lustre/tests/racer.sh
@@ -92,6 +92,7 @@ test_1() {
                        RACER_ENABLE_PFL=$RACER_ENABLE_PFL \
                        RACER_ENABLE_DOM=$RACER_ENABLE_DOM \
                        RACER_ENABLE_FLR=$RACER_ENABLE_FLR \
+                       RACER_MAX_CLEANUP_WAIT=$RACER_MAX_CLEANUP_WAIT \
                        LFS=$LFS \
                        LCTL=$LCTL \
                        $racer $rdir $NUM_RACER_THREADS" &

diff --git a/lustre/tests/racer/racer.sh b/lustre/tests/racer/racer.sh
index 036b569..23b6ba3 100755 (executable)
--- a/lustre/tests/racer/racer.sh
+++ b/lustre/tests/racer/racer.sh
@@ -9,6 +9,8 @@ MDSCOUNT=${MDSCOUNT:-1}
 NUM_THREADS=${NUM_THREADS:-$2}
 NUM_THREADS=${NUM_THREADS:-3}
 
+RACER_MAX_CLEANUP_WAIT=${RACER_MAX_CLEANUP_WAIT:-$DURATION}
+
 mkdir -p $DIR
 
 RACER_PROGS="file_create dir_create file_rm file_rename file_link file_symlink \
@@ -32,11 +34,10 @@ racer_cleanup()
        trap 0
 
        local TOT_WAIT=0
-       local MAX_WAIT=$DURATION
        local SHORT_WAIT=5
 
        local rc
-       while [[ $TOT_WAIT -le $MAX_WAIT ]]; do
+       while [[ $TOT_WAIT -le $RACER_MAX_CLEANUP_WAIT ]]; do
                rc=0
                echo sleeping $SHORT_WAIT sec ...
                sleep $SHORT_WAIT
@@ -58,9 +59,9 @@ racer_cleanup()
                        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 ))
+               echo -n "Waited $TOT_WAIT, rc=$rc "
+               (( SHORT_WAIT+=SHORT_WAIT ))
        done
        ps uww -C "${RACER_PROGS// /.sh,}.sh"
        return 1