From 009c986bb5e7fea309ebce1427437d7bbceedc6f Mon Sep 17 00:00:00 2001 From: Emoly Liu Date: Wed, 6 Dec 2017 15:06:00 +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/30365 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Minh Diep Reviewed-by: John L. Hammond --- lustre/tests/sanity.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index b7b52e5..b06dff2 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -6895,13 +6895,15 @@ 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) $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) ]; then - [ $(lustre_version_code ost1) -ge $(version_code 2.9.52) ] && - suffix="M" + if [ $ostver -ge $(version_code 2.8.52) ] || + [ $ostver -ge $(version_code 2.7.17) -a \ + $ostver -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