From 3643e27f7a97dac195a102db4cf7f895e019159c Mon Sep 17 00:00:00 2001 From: James Nunez Date: Mon, 26 Aug 2019 15:43:54 -0600 Subject: [PATCH] LU-11607 tests: replace lustre_version in mds-survey/pcc/sec MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The routine get_lustre_env() is available to all Lustre test suites and sets an environment variable for the Lustre version of servers; MGS, MDS1, etc. In mds-survey, sanity-sec, ost-pools,replay-single and sanity-pcc, replace the calls to lustre_version_code() and lustre_build_version() for all server types with definitions from get_lustre_env(). While doing this, replace ‘lustre_version_code $SINGLEMDS’ with ‘MDS1_VERSION’. If skip_env() is called based on a Lustre version check, change this to skip(). Clean up around any modifications by removing calls to return() or exit() after skip() or skip_env(). Test-Parameters: trivial testlist=mds-survey,sanity-pcc,sanity-sec,ost-pools,replay-single Test-Parameters: fstype=zfs testlist=mds-survey,sanity-pcc,sanity-sec,ost-pools,replay-single Signed-off-by: James Nunez Change-Id: Ia4b0f426943fdc2f4bcdaa312fbb6f6113ee058f Reviewed-on: https://review.whamcloud.com/35928 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Emoly Liu --- lustre/tests/mds-survey.sh | 4 +- lustre/tests/ost-pools.sh | 12 ++-- lustre/tests/replay-ost-single.sh | 24 +++---- lustre/tests/sanity-pcc.sh | 4 +- lustre/tests/sanity-sec.sh | 133 +++++++++++++++++--------------------- 5 files changed, 82 insertions(+), 95 deletions(-) diff --git a/lustre/tests/mds-survey.sh b/lustre/tests/mds-survey.sh index 3d1ca65..93715b2 100644 --- a/lustre/tests/mds-survey.sh +++ b/lustre/tests/mds-survey.sh @@ -13,8 +13,8 @@ build_test_filter MDSSURVEY=${MDSSURVEY:-$(which mds-survey 2>/dev/null || true)} [ -z ${MDSSURVEY} ] && skip_env "mds-survey not found" -if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.51) ]; then - skip_env "Need MDS version at least 2.3.51" +if [ "$MDS1_VERSION" -lt $(version_code 2.3.51) ]; then + skip "Need MDS version at least 2.3.51" fi file_count=${file_count:-150000} diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh index 2f1700f..fecd8fc 100755 --- a/lustre/tests/ost-pools.sh +++ b/lustre/tests/ost-pools.sh @@ -1138,7 +1138,7 @@ test_20() { check_file_not_in_pool $dir2/file4 $POOL check_file_not_in_pool $dir1/file5 $POOL2 - if [ $(lustre_version_code mds1) -ge $(version_code 2.10.54) ]; then + if [ "$MDS1_VERSION" -ge $(version_code 2.10.54) ]; then check_dir_in_pool $dir3 $POOL check_file_in_pool $dir3/file3 $POOL check_file_in_pool $dir2/file4 $POOL2 @@ -1240,7 +1240,7 @@ test_23a() { # XXX remove the interoperability code once we drop the old server # ( < 2.3.50) support. - if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.50) ]; then + if [ "$MDS1_VERSION" -lt $(version_code 2.3.50) ]; then $LFS quotaoff -ug $MOUNT $LFS quotacheck -ug $MOUNT else @@ -1316,7 +1316,7 @@ test_23b() { # XXX remove the interoperability code once we drop the old server # ( < 2.3.50) support. - if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.50) ]; then + if [ "$MDS1_VERSION" -lt $(version_code 2.3.50) ]; then $LFS quotaoff -ug $MOUNT else if [[ $PERM_CMD == *"set_param -P"* ]]; then @@ -1373,13 +1373,11 @@ test_23b() { run_test 23b "OST pools and OOS" test_24() { - local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir} [[ $OSTCOUNT -le 1 ]] && skip_env "needs >= 2 OSTs" - - local server_version=$(lustre_version_code $SINGLEMDS) - [[ $server_version -ge $(version_code 2.8.56) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.8.56) ]] || skip "Need server version newer than 2.8.55" + local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir} local numfiles=10 local i=0 local TGT diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh index 379757b..618ddb0 100755 --- a/lustre/tests/replay-ost-single.sh +++ b/lustre/tests/replay-ost-single.sh @@ -270,8 +270,8 @@ test_7() { run_test 7 "Fail OST before obd_destroy" test_8a() { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.0) ]] || - { skip "Need MDS version at least 2.3.0"; return; } + [[ "$MDS1_VERSION" -ge $(version_code 2.3.0) ]] || + skip "Need MDS version at least 2.3.0" verify=$ROOT/tmp/verify-$$ dd if=/dev/urandom of=$verify bs=4096 count=1280 || error "Create verify file failed" @@ -294,8 +294,8 @@ test_8a() { run_test 8a "Verify redo io: redo io when get -EINPROGRESS error" test_8b() { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.0) ]] || - { skip "Need MDS version at least 2.3.0"; return; } + [[ "$MDS1_VERSION" -ge $(version_code 2.3.0) ]] || + skip "Need MDS version at least 2.3.0" verify=$ROOT/tmp/verify-$$ dd if=/dev/urandom of=$verify bs=4096 count=1280 || error "Create verify file failed" @@ -314,8 +314,8 @@ test_8b() { run_test 8b "Verify redo io: redo io should success after recovery" test_8c() { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.0) ]] || - { skip "Need MDS version at least 2.3.0"; return; } + [[ "$MDS1_VERSION" -ge $(version_code 2.3.0) ]] || + skip "Need MDS version at least 2.3.0" verify=$ROOT/tmp/verify-$$ dd if=/dev/urandom of=$verify bs=4096 count=1280 || error "Create verify file failed" @@ -336,8 +336,8 @@ test_8c() { run_test 8c "Verify redo io: redo io should fail after eviction" test_8d() { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.0) ]] || - { skip "Need MDS version at least 2.3.0"; return; } + [[ "$MDS1_VERSION" -ge $(version_code 2.3.0) ]] || + skip "Need MDS version at least 2.3.0" #define OBD_FAIL_MDS_DQACQ_NET 0x187 do_facet $SINGLEMDS "lctl set_param fail_loc=0x187" # test the non-intent create path @@ -369,8 +369,8 @@ test_8d() { run_test 8d "Verify redo creation on -EINPROGRESS" test_8e() { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.0) ]] || - { skip "Need MDS version at least 2.3.0"; return; } + [[ "$MDS1_VERSION" -ge $(version_code 2.3.0) ]] || + skip "Need MDS version at least 2.3.0" sleep 1 # ensure we have a fresh statfs #define OBD_FAIL_OST_STATFS_EINPROGRESS 0x231 do_facet ost1 "lctl set_param fail_loc=0x231" @@ -385,8 +385,8 @@ test_8e() { run_test 8e "Verify that ptlrpc resends request on -EINPROGRESS" test_9() { - [ $(lustre_version_code ost1) -ge $(version_code 2.6.54) ] || - { skip "Need OST version at least 2.6.54"; return; } + [ "$OST1_VERSION" -ge $(version_code 2.6.54) ] || + skip "Need OST version at least 2.6.54" $LFS setstripe -i 0 -c 1 $DIR/$tfile || error "setstripe failed" # LU-1573 - Add duplicate write to generate grants diff --git a/lustre/tests/sanity-pcc.sh b/lustre/tests/sanity-pcc.sh index a209f1b..c563df0 100644 --- a/lustre/tests/sanity-pcc.sh +++ b/lustre/tests/sanity-pcc.sh @@ -36,8 +36,8 @@ FAIL_ON_ERROR=false check_and_setup_lustre -if [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.12.52) ]]; then - skip_env "Need MDS version at least 2.12.52" && exit +if [[ "$MDS1_VERSION" -lt $(version_code 2.12.52) ]]; then + skip "Need MDS version at least 2.12.52" fi # $RUNAS_ID may get set incorrectly somewhere else diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index 949e146..a268ab1 100755 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -195,12 +195,10 @@ run_test 1 "setuid/gid =============================" # as for remote client, the groups of the specified uid on MDT # will be obtained by upcall /sbin/l_getidentity and used. test_4() { - local server_version=$(lustre_version_code $SINGLEMDS) - - [[ $server_version -ge $(version_code 2.6.93) ]] || - [[ $server_version -ge $(version_code 2.5.35) && - $server_version -lt $(version_code 2.5.50) ]] || - { skip "Need MDS version at least 2.6.93 or 2.5.35"; return; } + [[ "$MDS1_VERSION" -ge $(version_code 2.6.93) ]] || + [[ "$MDS1_VERSION" -ge $(version_code 2.5.35) && + "$MDS1_VERSION" -lt $(version_code 2.5.50) ]] || + skip "Need MDS version at least 2.6.93 or 2.5.35" rm -rf $DIR/$tdir mkdir -p $DIR/$tdir @@ -333,9 +331,9 @@ add_idmaps() { } update_idmaps() { #LU-10040 - [ $(lustre_version_code mgs) -lt $(version_code 2.10.55) ] && - skip "Need MGS >= 2.10.55" && - return + [ "$MGS_VERSION" -lt $(version_code 2.10.55) ] && + skip "Need MGS >= 2.10.55" + local csum=${HOSTNAME_CHECKSUM}_0 local old_id_client=$ID0 local old_id_fs=$((ID0 + 1)) @@ -456,9 +454,9 @@ modify_flags() { } squash_id() { - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" + local cmd cmd[0]="$LCTL nodemap_modify --property squash_uid" @@ -685,18 +683,17 @@ test_idmap() { test_7() { local rc - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + remote_mgs_nodsh && skip "remote MGS with nodsh" + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" create_nodemaps rc=$? - [[ $rc != 0 ]] && error "nodemap_add failed with $rc" && return 1 + [[ $rc != 0 ]] && error "nodemap_add failed with $rc" delete_nodemaps rc=$? - [[ $rc != 0 ]] && error "nodemap_del failed with $rc" && return 2 + [[ $rc != 0 ]] && error "nodemap_del failed with $rc" return 0 } @@ -705,10 +702,9 @@ run_test 7 "nodemap create and delete" test_8() { local rc - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + remote_mgs_nodsh && skip "remote MGS with nodsh" + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" # Set up nodemaps @@ -736,10 +732,9 @@ test_9() { local i local rc - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + remote_mgs_nodsh && skip "remote MGS with nodsh" + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" rc=0 create_nodemaps @@ -774,10 +769,9 @@ run_test 9 "nodemap range add" test_10a() { local rc - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + remote_mgs_nodsh && skip "remote MGS with nodsh" + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" rc=0 create_nodemaps @@ -819,8 +813,8 @@ test_10a() { run_test 10a "nodemap reject duplicate ranges" test_10b() { - [ $(lustre_version_code mgs) -lt $(version_code 2.10.53) ] && - skip "Need MGS >= 2.10.53" && return + [ "$MGS_VERSION" -lt $(version_code 2.10.53) ] && + skip "Need MGS >= 2.10.53" local nm1="nodemap1" local nm2="nodemap2" @@ -847,8 +841,8 @@ test_10b() { run_test 10b "delete range from the correct nodemap" test_10c() { #LU-8912 - [ $(lustre_version_code mgs) -lt $(version_code 2.10.57) ] && - skip "Need MGS >= 2.10.57" && return + [ "$MGS_VERSION" -lt $(version_code 2.10.57) ] && + skip "Need MGS >= 2.10.57" local nm="nodemap_lu8912" local nid_range="10.210.[32-47].[0-255]@o2ib3" @@ -877,8 +871,8 @@ test_10c() { #LU-8912 run_test 10c "verfify contiguous range support" test_10d() { #LU-8913 - [ $(lustre_version_code mgs) -lt $(version_code 2.10.59) ] && - skip "Need MGS >= 2.10.59" && return + [ "$MGS_VERSION" -lt $(version_code 2.10.59) ] && + skip "Need MGS >= 2.10.59" local nm="nodemap_lu8913" local nid_range="*@o2ib3" @@ -909,10 +903,9 @@ run_test 10d "verfify nodemap range format '*@' support" test_11() { local rc - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + remote_mgs_nodsh && skip "remote MGS with nodsh" + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" rc=0 create_nodemaps @@ -939,10 +932,9 @@ run_test 11 "nodemap modify" test_12() { local rc - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + remote_mgs_nodsh && skip "remote MGS with nodsh" + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" rc=0 create_nodemaps @@ -977,10 +969,9 @@ run_test 12 "nodemap set squash ids" test_13() { local rc - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + remote_mgs_nodsh && skip "remote MGS with nodsh" + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" rc=0 create_nodemaps @@ -1020,10 +1011,9 @@ run_test 13 "test nids" test_14() { local rc - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + remote_mgs_nodsh && skip "remote MGS with nodsh" + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" rc=0 create_nodemaps @@ -1055,10 +1045,9 @@ run_test 14 "test default nodemap nid lookup" test_15() { local rc - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && - return + remote_mgs_nodsh && skip "remote MGS with nodsh" + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" rc=0 create_nodemaps @@ -1503,8 +1492,8 @@ test_fops() { nodemap_version_check () { remote_mgs_nodsh && skip "remote MGS with nodsh" && return 1 - [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && + [ "$MGS_VERSION" -lt $(version_code 2.5.53) ] && + skip "No nodemap on $MGS_VERSION MGS < 2.5.53" && return 1 return 0 } @@ -1581,7 +1570,7 @@ run_test 16 "test nodemap all_off fileops" test_17() { if $SHARED_KEY && - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.55) ]; then + [ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then skip "Need MDS >= 2.11.55" fi @@ -1597,7 +1586,7 @@ run_test 17 "test nodemap trusted_noadmin fileops" test_18() { if $SHARED_KEY && - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.55) ]; then + [ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then skip "Need MDS >= 2.11.55" fi @@ -1613,7 +1602,7 @@ run_test 18 "test nodemap mapped_noadmin fileops" test_19() { if $SHARED_KEY && - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.55) ]; then + [ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then skip "Need MDS >= 2.11.55" fi @@ -1629,7 +1618,7 @@ run_test 19 "test nodemap trusted_admin fileops" test_20() { if $SHARED_KEY && - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.55) ]; then + [ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then skip "Need MDS >= 2.11.55" fi @@ -1645,7 +1634,7 @@ run_test 20 "test nodemap mapped_admin fileops" test_21() { if $SHARED_KEY && - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.55) ]; then + [ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then skip "Need MDS >= 2.11.55" fi @@ -1672,7 +1661,7 @@ run_test 21 "test nodemap mapped_trusted_noadmin fileops" test_22() { if $SHARED_KEY && - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.55) ]; then + [ "$MDS1_VERSION" -lt $(version_code 2.11.55) ]; then skip "Need MDS >= 2.11.55" fi @@ -1816,9 +1805,9 @@ test_23a() { run_test 23a "test mapped regular ACLs" test_23b() { #LU-9929 - [ $num_clients -lt 2 ] && skip "Need 2 clients at least" && return - [ $(lustre_version_code mgs) -lt $(version_code 2.10.53) ] && - skip "Need MGS >= 2.10.53" && return + [ $num_clients -lt 2 ] && skip "Need 2 clients at least" + [ "$MGS_VERSION" -lt $(version_code 2.10.53) ] && + skip "Need MGS >= 2.10.53" export SK_UNIQUE_NM=true nodemap_test_setup @@ -2059,8 +2048,8 @@ nodemap_exercise_fileset() { } test_27a() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.50) ] && - skip "Need MDS >= 2.11.50" && return + [ "$MDS1_VERSION" -lt $(version_code 2.11.50) ] && + skip "Need MDS >= 2.11.50" for nm in "default" "c0"; do local subdir="subdir_${nm}" @@ -2078,9 +2067,9 @@ test_27a() { run_test 27a "test fileset in various nodemaps" test_27b() { #LU-10703 - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.50) ] && - skip "Need MDS >= 2.11.50" && return - [[ $MDSCOUNT -lt 2 ]] && skip "needs >= 2 MDTs" && return + [ "$MDS1_VERSION" -lt $(version_code 2.11.50) ] && + skip "Need MDS >= 2.11.50" + [[ $MDSCOUNT -lt 2 ]] && skip "needs >= 2 MDTs" nodemap_test_setup trap nodemap_test_cleanup EXIT -- 1.8.3.1