From 4741a558e6bb12b08928819725e568991ddefbab Mon Sep 17 00:00:00 2001 From: Emoly Liu Date: Wed, 6 Dec 2017 15:46:11 +0800 Subject: [PATCH] LU-10330 tests: fix version check in sanity.sh test_101g 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 Reviewed-on: https://review.whamcloud.com/30389 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index d66fa79..da0a365 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -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 || -- 1.8.3.1