From f7155420024e142c86ec4a589ba4ba78679c9c8d Mon Sep 17 00:00:00 2001 From: James Nunez Date: Tue, 12 Feb 2019 17:13:11 -0700 Subject: [PATCH] LU-11208 tests: add version check to sanity tests sanity test 27G was added to Lustre tag 2.11.51. Thus, we need to check that the server is 2.11.51 or later before running test 27G (LU-11208). sanity test 239A, change version check to 2.10.4 (LU-10230). sanity test 311 was modified in Lustre tag 2.12.51. We need to check that the server is 2.12.51 or later (LU-11965). sanity test 317 was added to Lustre tag 2.11.53. We need to check that the server is 2.11.53 or later before running test 317 (LU-11778). Fixes: 37f6357a5c9f ("LU-10629 lod: Clear OST pool with setstripe") Fixes: 0ba690a526be ("LU-7251 osp: do not assign commit callback to every thandle") Fixes: a531ab5f38a6 ("LU-11605 osp: max_create_count and create_count changes") Fixes: 6115eb7fd5 ("LU-10370 ofd: truncate does not update blocks count on client") Test-Parameters: trivial serverjob=lustre-b2_10 serverbuildno=152 testlist=sanity Signed-off-by: James Nunez Change-Id: I3be45bd0bde5ec041fefef2559656ec74448dffa Reviewed-on: https://review.whamcloud.com/33420 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Wei Liu Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 1aecaf0..e78788a 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -2270,8 +2270,10 @@ test_27F() { # LU-5346/LU-7975 run_test 27F "Client resend delayed layout creation with non-zero size" test_27G() { #LU-10629 - [ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return - remote_mds_nodsh && skip "remote MDS with nodsh" && return + [ $MDS1_VERSION -lt $(version_code 2.11.51) ] && + skip "Need MDS version at least 2.11.51" + [ -n "$FILESET" ] && skip "SKIP due to FILESET set" + remote_mds_nodsh && skip "remote MDS with nodsh" local POOL=${POOL:-testpool} local ostrange="0 0 1" @@ -15805,7 +15807,7 @@ test_239A() { # was test_239 mkdir -p $DIR/$tdir createmany -o $DIR/$tdir/f- 5000 unlinkmany $DIR/$tdir/f- 5000 - [ $MDS1_VERSION -gt $(version_code 2.10.53) ] && + [ $MDS1_VERSION -gt $(version_code 2.10.4) ] && do_nodes $list "lctl set_param -n osp.*.force_sync=1" changes=$(do_nodes $list "lctl get_param -n osp.*MDT*.sync_changes \ osp.*MDT*.sync_in_flight" | calc_sum) @@ -18502,7 +18504,7 @@ test_311() { do_nodes $mdts "$LCTL set_param -n \ osp.*OST0000*.max_create_count=$max_count" - [ $(lustre_version_code $facet) -lt $(version_code 2.11.56) ] && + [ $MDS1_VERSION -lt $(version_code 2.12.51) ] && do_nodes $mdts "$LCTL set_param -n \ osp.*OST0000*.create_count=$count" do_nodes $mdts "$LCTL get_param osp.*OST0000*.create_count" | @@ -18685,6 +18687,8 @@ test_316() { run_test 316 "lfs mv" test_317() { + [ $MDS1_VERSION -lt $(version_code 2.11.53) ] && + skip "Need MDS version at least 2.11.53" local trunc_sz local grant_blk_size -- 1.8.3.1