LU-4684 tests: enable racer directory migration

Enable the dir_migrate test by default in racer test runs.

Update test selection logic to match newer script code style.

Test-Parameters: trivial testlist=racer env=DURATION=3600
Test-Parameters: fstype=zfs testlist=racer env=DURATION=600
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ifba84c64b30d90b4a159232751b68c48c88dafcc
Reviewed-on: https://review.whamcloud.com/41359
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Lai Siyao <lai.siyao@whamcloud.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 1f21f42..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
 
        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
 
 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
 
        RACER_ENABLE_PFL=false
 

-[[ "$MDS1_VERSION" -le $(version_code 2.10.53) ]] &&
+(( "$MDS1_VERSION" <= $(version_code 2.10.53) )) &&

        RACER_ENABLE_DOM=false
 
        RACER_ENABLE_DOM=false
 

-[[ "$MDS1_VERSION" -lt $(version_code 2.10.55) ]] &&
+(( "$MDS1_VERSION" < $(version_code 2.10.55) )) &&

        RACER_ENABLE_FLR=false
 
        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}
        RACER_ENABLE_SEL=false
 
 RACER_ENABLE_REMOTE_DIRS=${RACER_ENABLE_REMOTE_DIRS:-false}