Whamcloud - gitweb
LU-10330 tests: fix version check in sanity.sh test_101g 89/30389/2
authorEmoly Liu <emoly.liu@intel.com>
Wed, 6 Dec 2017 07:46:11 +0000 (15:46 +0800)
committerOleg Drokin <oleg.drokin@intel.com>
Sun, 17 Dec 2017 06:20:38 +0000 (06:20 +0000)
The 16MB RPC patch is available in 2.7.x, so one more version
check needs to be added to 2.7.17 or later to avoid interop
failure.

Test-Parameters: trivial

Change-Id: I6eeefbf74017aaeeb8998accd6da04d8de75606c
Signed-off-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-on: https://review.whamcloud.com/30389
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/tests/sanity.sh

index d66fa79..da0a365 100755 (executable)
@@ -7044,14 +7044,19 @@ test_101g() {
        local list=$(comma_list $(osts_nodes))
        local p="$TMP/$TESTSUITE-$TESTNAME.parameters"
        local brw_size="obdfilter.*.brw_size"
+       local ostver=$(lustre_version_code ost1)
+       local cliver=$(lustre_version_code client)
 
        $LFS setstripe -i 0 -c 1 $DIR/$tfile
 
        local orig_mb=$(do_facet ost1 $LCTL get_param -n $brw_size | head -n 1)
-       if [ $(lustre_version_code ost1) -ge $(version_code 2.8.52) -a \
-            $(lustre_version_code client) -ge $(version_code 2.8.52) ]; then
-               [ $(lustre_version_code ost1) -ge $(version_code 2.9.52) ] &&
-                       suffix="M"
+       if [ $ostver -ge $(version_code 2.8.52) -o \
+            \( $ostver -ge $(version_code 2.7.17) -a \
+               $ostver -lt $(version_code 2.7.50) \) ] &&
+          [ $cliver -ge $(version_code 2.8.52) -o \
+            \( $cliver -ge $(version_code 2.7.17) -a \
+               $cliver -lt $(version_code 2.7.50) \) ]; then
+               [ $ostver -ge $(version_code 2.9.52) ] && suffix="M"
                if [[ $orig_mb -lt 16 ]]; then
                        save_lustre_params $osts "$brw_size" > $p
                        do_nodes $list $LCTL set_param -n $brw_size=16$suffix ||