LU-15103 tests: clean up busy cifs mount

[fs/lustre-release.git] / lustre / tests / racer.sh

diff --git a/lustre/tests/racer.sh b/lustre/tests/racer.sh
index 42eff29..35c1cbd 100644 (file)
--- a/lustre/tests/racer.sh
+++ b/lustre/tests/racer.sh
@@ -38,30 +38,28 @@ if $RACER_FAILOVER; then
        echo Victim facets ${victims[@]}
 fi
 
-#LU-4684
-RACER_ENABLE_MIGRATION=false
-
-if ((MDSCOUNT > 1 && "$MDS1_VERSION" >= $(version_code 2.8.0))); then
-       RACER_ENABLE_REMOTE_DIRS=${RACER_ENABLE_REMOTE_DIRS:-true}
-       RACER_ENABLE_STRIPED_DIRS=${RACER_ENABLE_STRIPED_DIRS:-true}
-       RACER_ENABLE_MIGRATION=${RACER_ENABLE_MIGRATION:-true}
-elif ((MDSCOUNT > 1 && "$MDS1_VERSION" >= $(version_code 2.5.0))); then
-       RACER_ENABLE_REMOTE_DIRS=${RACER_ENABLE_REMOTE_DIRS:-true}
+if ((MDSCOUNT > 1)); then
+       (( $MDS1_VERSION >= $(version_code 2.5.0) )) &&
+               RACER_ENABLE_REMOTE_DIRS=${RACER_ENABLE_REMOTE_DIRS:-true}
+       (( $MDS1_VERSION >= $(version_code 2.8.0) )) &&
+               RACER_ENABLE_STRIPED_DIRS=${RACER_ENABLE_STRIPED_DIRS:-true}
+       (( $MDS1_VERSION >= $(version_code 2.13.57) )) &&
+               RACER_ENABLE_MIGRATION=${RACER_ENABLE_MIGRATION:-true}
 fi
 
-[[ "$MDS1_VERSION" -lt $(version_code 2.9.54) ||
-   $(facet_fstype mgs) != zfs ]] && RACER_ENABLE_SNAPSHOT=false
+[[ "$MDS1_VERSION" -lt $(version_code 2.9.54) || $mgs_FSTYPE != zfs ]] &&
+       RACER_ENABLE_SNAPSHOT=false
 
-[[ "$MDS1_VERSION" -le $(version_code 2.9.55) ]] &&
+(( "$MDS1_VERSION" <= $(version_code 2.9.55) )) &&
        RACER_ENABLE_PFL=false
 
-[[ "$MDS1_VERSION" -le $(version_code 2.10.53) ]] &&
+(( "$MDS1_VERSION" <= $(version_code 2.10.53) )) &&
        RACER_ENABLE_DOM=false
 
-[[ "$MDS1_VERSION" -lt $(version_code 2.10.55) ]] &&
+(( "$MDS1_VERSION" < $(version_code 2.10.55) )) &&
        RACER_ENABLE_FLR=false
 
-[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.12.0) ]] &&
+(( $MDS1_VERSION < $(version_code 2.12.0) )) &&
        RACER_ENABLE_SEL=false
 
 RACER_ENABLE_REMOTE_DIRS=${RACER_ENABLE_REMOTE_DIRS:-false}
@@ -72,6 +70,7 @@ RACER_ENABLE_PFL=${RACER_ENABLE_PFL:-true}
 RACER_ENABLE_DOM=${RACER_ENABLE_DOM:-true}
 RACER_ENABLE_FLR=${RACER_ENABLE_FLR:-true}
 RACER_ENABLE_SEL=${RACER_ENABLE_SEL:-true}
+RACER_EXTRA_LAYOUT=${RACER_EXTRA_LAYOUT:-""}
 
 fail_random_facet () {
        local facets=${victims[@]}
@@ -101,7 +100,10 @@ test_1() {
 
                RDIRS="$RDIRS $d/racer"
                mkdir -p $d/racer
-       #       lfs setstripe $d/racer -c -1
+               if [[ -n "$RACER_EXTRA_LAYOUT" ]]; then
+                       $LFS setstripe $d/racer $RACER_EXTRA_LAYOUT ||
+                       error "setstripe $RACER_EXTRA_LAYOUT failed"
+               fi
                if [ $MDSCOUNT -ge 2 ]; then
                        for i in $(seq $((MDSCOUNT - 1))); do
                                RDIRS="$RDIRS $d/racer$i"
@@ -109,6 +111,12 @@ test_1() {
                                        $LFS mkdir -i $i $d/racer$i ||
                                                error "lfs mkdir $i failed"
                                fi
+                               if [[ -n "$RACER_EXTRA_LAYOUT" ]]; then
+                                       $LFS setstripe $d/racer$i \
+                                               $RACER_EXTRA_LAYOUT ||
+                                       error "setstripe \
+                                               $RACER_EXTRA_LAYOUT failed"
+                               fi
                        done
                fi
        done
@@ -125,6 +133,11 @@ test_1() {
                        RACER_ENABLE_FLR=$RACER_ENABLE_FLR \
                        RACER_MAX_CLEANUP_WAIT=$RACER_MAX_CLEANUP_WAIT \
                        RACER_ENABLE_SEL=$RACER_ENABLE_SEL \
+                       RACER_EXTRA=$RACER_EXTRA \
+                       RACER_EXTRA_LAYOUT=\\\"$RACER_EXTRA_LAYOUT\\\" \
+                       RACER_PROGS=$RACER_PROGS \
+                       NUM_THREADS=$NUM_THREADS \
+                       MAX_FILES=$MAX_FILES \
                        LFS=$LFS \
                        LCTL=$LCTL \
                        $racer $rdir $NUM_RACER_THREADS" &