X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=e78788a706102b0119e023f07bfad4aafc6ad0a3;hp=a378f38388089af2167c235d7d6c4b9ed4644f12;hb=f7155420024e142c86ec4a589ba4ba78679c9c8d;hpb=fffef5c29e3bdf0f96168abc3d0488bad06f33bb diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index a378f38..e78788a 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -8,8 +8,8 @@ set -e ONLY=${ONLY:-"$*"} -# bug number for skipped test: LU-9693 LU-6493 LU-9693 LU-11058 -ALWAYS_EXCEPT="$SANITY_EXCEPT 42a 42b 42c 77k" +# bug number for skipped test: LU-9693 LU-6493 LU-9693 +ALWAYS_EXCEPT="$SANITY_EXCEPT 42a 42b 42c" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! # skipped tests: LU-8411 LU-9096 LU-9054 .. @@ -23,8 +23,8 @@ fi if [[ $(uname -m) = aarch64 ]]; then # bug number: LU-11596 (all below) ALWAYS_EXCEPT+=" 42d 42e 63a 63b 64a 64b 64c" - # bug number: LU-11671 LU-11665 LU-11594 LU-11667 LU-11729 - ALWAYS_EXCEPT+=" 45 101c 103a 317 810" + # bug number: LU-11671 LU-11594 LU-11667 LU-11729 + ALWAYS_EXCEPT+=" 45 103a 317 810" fi # Check Grants after these tests @@ -68,17 +68,13 @@ LUSTRE_TESTS_API_DIR=${LUSTRE_TESTS_API_DIR:-${LUSTRE}/tests/clientapi} . $LUSTRE/tests/test-framework.sh init_test_env $@ . ${CONFIG:=$LUSTRE/tests/cfg/${NAME}.sh} +get_lustre_env init_logging -if [[ $MDSCOUNT -gt 1 ]]; then - # bug number: LU-11161 - ALWAYS_EXCEPT+=" 160g" -fi - # 5 12 (min)" [ "$SLOW" = "no" ] && EXCEPT_SLOW="27m 64b 68 71 115 300o" -if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then +if [ "$mds1_FSTYPE" = "zfs" ]; then # bug number for skipped test: LU-1957 ALWAYS_EXCEPT="$ALWAYS_EXCEPT 180" # 13 (min)" @@ -154,7 +150,8 @@ MAXFREE=${MAXFREE:-$((200000 * $OSTCOUNT))} rm -rf $DIR/[Rdfs][0-9]* # $RUNAS_ID may get set incorrectly somewhere else -[ $UID -eq 0 -a $RUNAS_ID -eq 0 ] && error "\$RUNAS_ID set to 0, but \$UID is also 0!" +[ $UID -eq 0 -a $RUNAS_ID -eq 0 ] && + error "\$RUNAS_ID set to 0, but \$UID is also 0!" check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS @@ -198,7 +195,7 @@ test_0c() { run_test 0c "check import proc" test_0d() { # LU-3397 - [ $(lustre_version_code mgs) -lt $(version_code 2.10.57) ] && + [ $MGS_VERSION -lt $(version_code 2.10.57) ] && skip "proc exports not supported before 2.10.57" local mgs_exp="mgs.MGS.exports" @@ -230,7 +227,7 @@ test_0d() { # LU-3397 # Compare the value of client version exp_client_version=$(awk '/target_version:/ { print $2 }' $temp_exp) exp_val=$(version_code $exp_client_version) - imp_val=$(lustre_version_code client) + imp_val=$CLIENT_VERSION [ "$exp_val" == "$imp_val" ] || error "export client version '$exp_val' != '$imp_val'" } @@ -548,12 +545,12 @@ test_17g() { local TESTS="59 60 61 4094 4095" # Fix for inode size boundary in 2.1.4 - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.1.4) ] && + [ $MDS1_VERSION -lt $(version_code 2.1.4) ] && TESTS="4094 4095" # Patch not applied to 2.2 or 2.3 branches - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] && - [ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.3.55) ] && + [ $MDS1_VERSION -ge $(version_code 2.2.0) ] && + [ $MDS1_VERSION -le $(version_code 2.3.55) ] && TESTS="4094 4095" # skip long symlink name for rhel6.5. @@ -638,11 +635,10 @@ run_test 17l "Ensure lgetxattr's returned xattr size is consistent" # LU-1540 test_17m() { [ $PARALLEL == "yes" ] && skip "skip parallel run" - [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && - skip_env "ldiskfs only test" + [ "$mds1_FSTYPE" != "ldiskfs" ] && skip_env "ldiskfs only test" remote_mds_nodsh && skip "remote MDS with nodsh" - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] && - [ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.2.93) ] && + [ $MDS1_VERSION -ge $(version_code 2.2.0) ] && + [ $MDS1_VERSION -le $(version_code 2.2.93) ] && skip "MDS 2.2.0-2.2.93 do not NUL-terminate symlinks" local short_sym="0123456789" @@ -715,11 +711,10 @@ check_fs_consistency_17n() { test_17n() { [[ $MDSCOUNT -lt 2 ]] && skip_env "needs >= 2 MDTs" [ $PARALLEL == "yes" ] && skip "skip parallel run" - [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && - skip_env "ldiskfs only test" + [ "$mds1_FSTYPE" != "ldiskfs" ] && skip_env "ldiskfs only test" remote_mds_nodsh && skip "remote MDS with nodsh" - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] && - [ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.2.93) ] && + [ $MDS1_VERSION -ge $(version_code 2.2.0) ] && + [ $MDS1_VERSION -le $(version_code 2.2.93) ] && skip "MDS 2.2.0-2.2.93 do not NUL-terminate symlinks" local i @@ -743,7 +738,7 @@ test_17n() { check_fs_consistency_17n || error "e2fsck report error after unlink files under remote dir" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.50) ] && + [ $MDS1_VERSION -lt $(version_code 2.4.50) ] && skip "lustre < 2.4.50 does not support migrate mv" for ((i = 0; i < 10; i++)); do @@ -766,7 +761,7 @@ run_test 17n "run e2fsck against master/slave MDT which contains remote dir" test_17o() { remote_mds_nodsh && skip "remote MDS with nodsh" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.64) ] && + [ $MDS1_VERSION -lt $(version_code 2.3.64) ] && skip "Need MDS version at least 2.3.64" local wdir=$DIR/${tdir}o @@ -1169,7 +1164,7 @@ test_24v() { local fname="$DIR/$tdir/$tfile" # Performance issue on ZFS see LU-4072 (c.f. LU-2887) - [ $(facet_fstype $SINGLEMDS) = "zfs" ] && nrfiles=${COUNT:-10000} + [ "$mds1_FSTYPE" = "zfs" ] && nrfiles=${COUNT:-10000} test_mkdir "$(dirname $fname)" # assume MDT0000 has the fewest inodes @@ -1229,7 +1224,7 @@ run_test 24w "Reading a file larger than 4Gb" test_24x() { [[ $MDSCOUNT -lt 2 ]] && skip_env "needs >= 2 MDTs" [ $PARALLEL == "yes" ] && skip "skip parallel run" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.56) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.7.56) ]] && skip "Need MDS version at least 2.7.56" local MDTIDX=1 @@ -1496,7 +1491,7 @@ run_test 27d "create file with default settings" test_27e() { # LU-5839 adds check for existed layout before setting it - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.56) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.7.56) ]] && skip "Need MDS version at least 2.7.56" test_mkdir $DIR/$tdir @@ -2050,7 +2045,7 @@ check_seq_oid() error "FF stripe $ff_pstripe != $stripe_nr" stripe_nr=$((stripe_nr + 1)) - [ $(lustre_version_code client) -lt $(version_code 2.9.55) ] && + [ $CLIENT_VERSION -lt $(version_code 2.9.55) ] && continue if grep -q 'stripe_count=' <<<$ff; then local ff_scnt=$(sed -e 's/.*stripe_count=//' \ @@ -2186,10 +2181,10 @@ test_27D() { pool_add_targets $POOL $ost_range || error "pool_add_targets failed" local skip27D - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.8.55) ] && skip27D+="-s 29" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.9.55) -o \ - $(lustre_version_code client) -lt $(version_code 2.9.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.9.55) -o \ + $CLIENT_VERSION -lt $(version_code 2.9.55) ] && skip27D+=" -s 30,31" llapi_layout_test -d$DIR/$tdir -p$POOL -o$OSTCOUNT $skip27D || error "llapi_layout_test failed" @@ -2206,7 +2201,7 @@ run_test 27D "validate llapi_layout API" # accessing a widely striped file. test_27E() { [ $OSTCOUNT -lt 2 ] && skip_env "needs >= 2 OSTs" - [ $(lustre_version_code client) -lt $(version_code 2.5.57) ] && + [ $CLIENT_VERSION -lt $(version_code 2.5.57) ] && skip "client does not have LU-3338 fix" # 72 bytes is the minimum space required to store striping @@ -2236,7 +2231,7 @@ run_test 27E "check that default extended attribute size properly increases" test_27F() { # LU-5346/LU-7975 [ $PARALLEL == "yes" ] && skip "skip parallel run" [[ $OSTCOUNT -lt 2 ]] && skip "needs >= 2 OSTs" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.51) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.8.51) ]] && skip "Need MDS version at least 2.8.51" remote_ost_nodsh && skip "remote OST with nodsh" @@ -2275,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" @@ -2300,7 +2297,7 @@ test_27G() { #LU-10629 run_test 27G "Clear OST pool from stripe" test_27H() { - [[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.11.54) ]] && + [[ $MDS1_VERSION -le $(version_code 2.11.54) ]] && skip "Need MDS version newer than 2.11.54" [[ $OSTCOUNT -lt 3 ]] && skip_env "needs >= 3 OSTs" test_mkdir $DIR/$tdir @@ -4232,8 +4229,8 @@ run_test 46 "dirtying a previously written page ================" # test_47 is removed "Device nodes check" is moved to test_28 test_48a() { # bug 2399 - [ $(facet_fstype $SINGLEMDS) = "zfs" ] && - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.63) ] && + [ "$mds1_FSTYPE" = "zfs" ] && + [ $MDS1_VERSION -lt $(version_code 2.3.63) ] && skip "MDS prior to 2.3.63 handle ZFS dir .. incorrectly" test_mkdir $DIR/$tdir @@ -4495,7 +4492,7 @@ test_51d() { run_test 51d "check object distribution" test_51e() { - if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip_env "ldiskfs only test" fi @@ -4601,7 +4598,7 @@ test_53() { local found=false local support_last_seq=true - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.60) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.3.60) ]] || support_last_seq=false # only test MDT0000 @@ -5388,7 +5385,7 @@ test_56w() { check_stripe_count $dir/file1 $expected - if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.90) ]; + if [ $MDS1_VERSION -ge $(version_code 2.6.90) ]; then # lfs_migrate file onto OST 0 if it is on OST 1, or onto # OST 1 if it is on OST 0. This file is small enough to @@ -5789,7 +5786,7 @@ check_migrate_links() { } test_56xb() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" local dir="$DIR/$tdir" @@ -5814,7 +5811,7 @@ test_56xb() { run_test 56xb "lfs migration hard link support" test_56y() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.53) ] && + [ $MDS1_VERSION -lt $(version_code 2.4.53) ] && skip "No HSM $(lustre_build_version $SINGLEMDS) MDS < 2.4.53" local res="" @@ -5909,7 +5906,7 @@ test_56ab() { # LU-10705 run_test 56ab "lfs find --blocks" test_56ba() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.50) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.50) ] && skip "Need MDS version at least 2.10.50" # Create composite files with one component @@ -5974,7 +5971,7 @@ test_56ba() { run_test 56ba "test lfs find --component-end, -start, -count, and -flags" test_56ca() { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.57) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.10.57) ]] || skip "Need MDS version at least 2.10.57" local td=$DIR/$tdir @@ -6050,7 +6047,7 @@ run_test 56ca "check lfs find --mirror-count|-N and --mirror-state" test_57a() { [ $PARALLEL == "yes" ] && skip "skip parallel run" # note test will not do anything if MDS is not local - if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip_env "ldiskfs only test" fi remote_mds_nodsh && skip "remote MDS with nodsh" @@ -6070,7 +6067,7 @@ run_test 57a "verify MDS filesystem created with large inodes ==" test_57b() { [ $PARALLEL == "yes" ] && skip "skip parallel run" - if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip_env "ldiskfs only test" fi remote_mds_nodsh && skip "remote MDS with nodsh" @@ -6162,7 +6159,7 @@ test_60a() { skip_env "missing subtest run-llog.sh" log "$TEST60_HEAD - from kernel mode" - do_facet mgs "$LCTL set_param debug=warning; $LCTL dk > /dev/null" + do_facet mgs "$LCTL dk > /dev/null" do_facet mgs "bash run-llog.sh" || error "run-llog.sh failed" do_facet mgs $LCTL dk > $TMP/$tfile @@ -6242,48 +6239,6 @@ test_60a() { } run_test 60a "llog_test run from kernel module and test llog_reader" -test_60aa() { - remote_mgs_nodsh && skip "remote MGS with nodsh" - - # test old logid format - if [ $(lustre_version_code mgs) -le $(version_code 3.1.53) ]; then - do_facet mgs $LCTL dl | grep MGS - do_facet mgs "$LCTL --device %MGS llog_print \\\\\\\$$FSNAME-client" || - error "old llog_print failed" - fi - - # test new logid format - if [ $(lustre_version_code mgs) -ge $(version_code 2.9.53) ]; then - do_facet mgs "$LCTL --device MGS llog_print $FSNAME-client" || - error "new llog_print failed" - fi -} -run_test 60aa "llog_print works with FIDs and simple names" - -test_60ab() { - # test llog_print with params - - [[ $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.11.51) ]] || - skip "Need server version greater than 2.11.51" - - local yaml - local orig_val - - orig_val=$(do_facet mgs $LCTL get_param jobid_name) - do_facet mgs $LCTL set_param -P jobid_name="testname" - - yaml=$(do_facet mgs $LCTL --device MGS llog_print params | - grep jobid_name | tail -n 1) - - local param=`awk '{ print $10 }' <<< "$yaml"` - local val=`awk '{ print $12 }' <<< "$yaml"` - #return to the default - do_facet mgs $LCTL set_param -P jobid_name=$orig_val - [ $val = "testname" ] || error "bad value: $val" - [ $param = "jobid_name," ] || error "Bad param: $param" -} -run_test 60ab "llog_print params output values from set_param -P" - test_60b() { # bug 6411 [ $PARALLEL == "yes" ] && skip "skip parallel run" @@ -6519,7 +6474,7 @@ grant_chunk() { } test_64d() { - [ $(lustre_version_code ost1) -lt $(version_code 2.10.56) ] && + [ $OST1_VERSION -lt $(version_code 2.10.56) ] && skip "OST < 2.10.55 doesn't limit grants enough" local tgt=$($LCTL dl | grep "0000-osc-[^mM]" | awk '{print $4}') @@ -6704,7 +6659,7 @@ test_65j() { # bug6367 } run_test 65j "set default striping on root directory (bug 6367)=" -cleaup_65k() { +cleanup_65k() { rm -rf $DIR/$tdir wait_delete_completed do_facet $SINGLEMDS "lctl set_param -n \ @@ -6723,7 +6678,7 @@ test_65k() { # bug11679 remote_mds_nodsh && skip "remote MDS with nodsh" local disable_precreate=true - [ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.8.54) ] && + [ $MDS1_VERSION -le $(version_code 2.8.54) ] && disable_precreate=false echo "Check OST status: " @@ -6798,6 +6753,101 @@ test_65m() { } run_test 65m "normal user can't set filesystem default stripe" +test_65n() { + [ -n "$FILESET" ] && skip "Not functional for FILESET set" + [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.12.50) ]] || + skip "Need MDS version at least 2.12.50" + [[ $PARALLEL != "yes" ]] || skip "skip parallel run" + + [[ $OSTCOUNT -ge 2 ]] || skip_env "needs >= 2 OSTs" + which getfattr > /dev/null 2>&1 || skip_env "no getfattr command" + which setfattr > /dev/null 2>&1 || skip_env "no setfattr command" + + local root_layout=$(save_layout $MOUNT) + stack_trap "restore_layout $MOUNT $root_layout" EXIT + + # new subdirectory under root directory should not inherit + # the default layout from root + local dir1=$MOUNT/$tdir-1 + mkdir $dir1 || error "mkdir $dir1 failed" + ! getfattr -n trusted.lov $dir1 &> /dev/null || + error "$dir1 shouldn't have LOV EA" + + # delete the default layout on root directory + $LFS setstripe -d $MOUNT || error "delete root default layout failed" + + local dir2=$MOUNT/$tdir-2 + mkdir $dir2 || error "mkdir $dir2 failed" + ! getfattr -n trusted.lov $dir2 &> /dev/null || + error "$dir2 shouldn't have LOV EA" + + # set a new striping pattern on root directory + local def_stripe_size=$($LFS getstripe -S $MOUNT) + local new_def_stripe_size=$((def_stripe_size * 2)) + $LFS setstripe -S $new_def_stripe_size $MOUNT || + error "set stripe size on $MOUNT failed" + + # new file created in $dir2 should inherit the new stripe size from + # the filesystem default + local file2=$dir2/$tfile-2 + touch $file2 || error "touch $file2 failed" + + local file2_stripe_size=$($LFS getstripe -S $file2) + [[ $file2_stripe_size -eq $new_def_stripe_size ]] || + error "$file2 didn't inherit stripe size $new_def_stripe_size" + + local dir3=$MOUNT/$tdir-3 + mkdir $dir3 || error "mkdir $dir3 failed" + ! getfattr -n trusted.lov $dir3 &> /dev/null || + error "$dir3 shouldn't have LOV EA" + + # set OST pool on root directory + local pool=$TESTNAME + pool_add $pool || error "add $pool failed" + pool_add_targets $pool 0 $((OSTCOUNT - 1)) 1 || + error "add targets to $pool failed" + + $LFS setstripe -p $pool $MOUNT || + error "set OST pool on $MOUNT failed" + + # new file created in $dir3 should inherit the pool from + # the filesystem default + local file3=$dir3/$tfile-3 + touch $file3 || error "touch $file3 failed" + + local file3_pool=$($LFS getstripe -p $file3) + [[ "$file3_pool" = "$pool" ]] || + error "$file3 didn't inherit OST pool $pool" + + local dir4=$MOUNT/$tdir-4 + mkdir $dir4 || error "mkdir $dir4 failed" + ! getfattr -n trusted.lov $dir4 &> /dev/null || + error "$dir4 shouldn't have LOV EA" + + # new file created in $dir4 should inherit the pool from + # the filesystem default + local file4=$dir4/$tfile-4 + touch $file4 || error "touch $file4 failed" + + local file4_pool=$($LFS getstripe -p $file4) + [[ "$file4_pool" = "$pool" ]] || + error "$file4 didn't inherit OST pool $pool" + + # new subdirectory under non-root directory should inherit + # the default layout from its parent directory + $LFS setstripe -S $new_def_stripe_size -p $pool $dir4 || + error "set directory layout on $dir4 failed" + + local dir5=$dir4/$tdir-5 + mkdir $dir5 || error "mkdir $dir5 failed" + + local dir4_layout=$(get_layout_param $dir4) + local dir5_layout=$(get_layout_param $dir5) + [[ "$dir4_layout" = "$dir5_layout" ]] || + error "$dir5 should inherit the default layout from $dir4" +} +run_test 65n "don't inherit default layout from root for new subdirectories" + # bug 2543 - update blocks count on client test_66() { [ $PARALLEL == "yes" ] && skip "skip parallel run" @@ -7121,7 +7171,7 @@ test_77c() { error "dd write error: $?" fid=$($LFS path2fid $DIR/$tfile) - if [ $(lustre_version_code ost1) -ge $(version_code 2.9.57) ] + if [ $OST1_VERSION -ge $(version_code 2.9.57) ] then check_ost=true ost_file_prefix=$(do_facet ost1 $LCTL get_param -n debug_path) @@ -7273,6 +7323,9 @@ test_77k() { # LU-10906 checksum=$(eval $get_checksum) [ $checksum -eq $i ] || error "checksum($checksum) != $i" done + # remove persistent param to avoid races with checksum mountopt below + do_facet mgs $LCTL set_param -P -d $cksum_param || + error "failed to delete checksum on MGS" for opt in "checksum" "nochecksum"; do #remount with mount option @@ -7386,7 +7439,7 @@ test_80() { # bug 10718 local soc_old=$(do_facet ost1 lctl get_param -n $soc | head -n1) local hosts= if [ "$soc_old" != "never" ] && - [ "$(facet_fstype ost1)" != "ldiskfs" ]; then + [ "$ost1_FSTYPE" != "ldiskfs" ]; then hosts=$(for host in $(seq -f "ost%g" 1 $OSTCOUNT); do facet_active_host $host; done | sort -u) do_nodes $hosts lctl set_param $soc=never @@ -7679,13 +7732,14 @@ test_101c() { local STRIPE_SIZE=1048576 local FILE_LENGTH=$((STRIPE_SIZE*100)) local nreads=10000 + local rsize=65536 local osc_rpc_stats setup_test101bc $STRIPE_SIZE $FILE_LENGTH cancel_lru_locks osc $LCTL set_param osc.*.rpc_stats 0 - $READS -f $DIR/$tfile -s$FILE_LENGTH -b65536 -n$nreads -t 180 + $READS -f $DIR/$tfile -s$FILE_LENGTH -b$rsize -n$nreads -t 180 for osc_rpc_stats in $($LCTL get_param -N osc.*.rpc_stats); do local stats=$($LCTL get_param -n $osc_rpc_stats) local lines=$(echo "$stats" | awk 'END {print NR;}') @@ -7697,8 +7751,8 @@ test_101c() { for size in 1 2 4 8; do local rpc=$(echo "$stats" | awk '($1 == "'$size':") {print $2; exit; }') - [ $rpc != 0 ] && - error "Small $((size*4))k read IO $rpc !" + [ $rpc != 0 ] && ((size * PAGE_SIZE < rsize)) && + error "Small $((size*PAGE_SIZE)) read IO $rpc!" done echo "$osc_rpc_stats check passed!" done @@ -7871,19 +7925,17 @@ 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 [ $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 [ $OST1_VERSION -ge $(version_code 2.8.52) -o \ + \( $OST1_VERSION -ge $(version_code 2.7.17) -a \ + $OST1_VERSION -lt $(version_code 2.7.50) \) ] && + [ $CLIENT_VERSION -ge $(version_code 2.8.52) -o \ + \( $CLIENT_VERSION -ge $(version_code 2.7.17) -a \ + $CLIENT_VERSION -lt $(version_code 2.7.50) \) ]; then + [ $OST1_VERSION -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 || @@ -8279,7 +8331,7 @@ getxattr() { # getxattr path name test_102n() { # LU-4101 mdt: protect internal xattrs [ -z "$(which setfattr 2>/dev/null)" ] && skip "could not find setfattr" - if [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.5.50) ] + if [ $MDS1_VERSION -lt $(version_code 2.5.50) ] then skip "MDT < 2.5.50 allows setxattr on internal trusted xattrs" fi @@ -8298,7 +8350,7 @@ test_102n() { # LU-4101 mdt: protect internal xattrs # Get 'before' xattrs of $file1. getfattr --absolute-names --dump --match=- $file1 > $xattr0 - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.53) ] && + [ $MDS1_VERSION -lt $(version_code 2.8.53) ] && namelist+=" lfsck_namespace" for name in $namelist; do # Try to copy xattr from $file0 to $file1. @@ -8324,7 +8376,7 @@ test_102n() { # LU-4101 mdt: protect internal xattrs setfattr --remove=$trusted.$name $file1 2> /dev/null done - if [ $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.6.50) ] + if [ $MDS1_VERSION -gt $(version_code 2.6.50) ] then name="lfsck_ns" # Try to copy xattr from $file0 to $file1. @@ -8359,7 +8411,7 @@ test_102n() { # LU-4101 mdt: protect internal xattrs run_test 102n "silently ignore setxattr on internal trusted xattrs" test_102p() { # LU-4703 setxattr did not check ownership - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.5.56) ] && + [ $MDS1_VERSION -lt $(version_code 2.5.56) ] && skip "MDS needs to be at least 2.5.56" local testfile=$DIR/$tfile @@ -8378,7 +8430,7 @@ test_102p() { # LU-4703 setxattr did not check ownership run_test 102p "check setxattr(2) correctly fails without permission" test_102q() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.6.92) ] && + [ $MDS1_VERSION -lt $(version_code 2.6.92) ] && skip "MDS needs to be at least 2.6.92" orphan_linkea_check $DIR/$tfile || error "orphan_linkea_check" @@ -8386,7 +8438,7 @@ test_102q() { run_test 102q "flistxattr should not return trusted.link EAs for orphans" test_102r() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.6.93) ] && + [ $MDS1_VERSION -lt $(version_code 2.6.93) ] && skip "MDS needs to be at least 2.6.93" touch $DIR/$tfile || error "touch" @@ -8419,7 +8471,7 @@ test_102r() { run_test 102r "set EAs with empty values" test_102s() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "MDS needs to be at least 2.11.52" local save="$TMP/$TESTSUITE-$TESTNAME.parameters" @@ -8445,7 +8497,7 @@ test_102s() { run_test 102s "getting nonexistent xattrs should fail" test_102t() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "MDS needs to be at least 2.11.52" local save="$TMP/$TESTSUITE-$TESTNAME.parameters" @@ -8506,9 +8558,9 @@ test_103a() { echo "performing permissions..." run_acl_subtest permissions || error "permissions failed" # LU-1482 mdd: Setting xattr are properly checked with and without ACLs - if [ $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.8.55) -o \ - \( $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.6) -a \ - $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.5.29) \) ] + if [ $MDS1_VERSION -gt $(version_code 2.8.55) -o \ + \( $MDS1_VERSION -lt $(version_code 2.6) -a \ + $MDS1_VERSION -ge $(version_code 2.5.29) \) ] then echo "performing permissions xattr..." run_acl_subtest permissions_xattr || @@ -8532,7 +8584,7 @@ test_103a() { fi echo "LU-2561 newly created file is same size as directory..." - if [ $(facet_fstype $SINGLEMDS) != "zfs" ]; then + if [ "$mds1_FSTYPE" != "zfs" ]; then run_acl_subtest 2561 || error "LU-2561 test failed" else run_acl_subtest 2561_zfs || error "LU-2561 zfs test failed" @@ -8552,6 +8604,7 @@ test_103a() { run_test 103a "acl test" test_103b() { + declare -a pids local U for U in {0..511}; do @@ -8576,6 +8629,12 @@ test_103b() { error "lfs setstripe -N2 $DIR/$tfile.m$O '$S' != '$O'" rm -f $DIR/$tfile.[smp]$0 } & + local pid=$! + + # limit the concurrently running threads to 64. LU-11878 + local idx=$((U % 64)) + [ -z "${pids[idx]}" ] || wait ${pids[idx]} + pids[idx]=$pid done wait } @@ -10265,9 +10324,9 @@ check_mds_dmesg() { test_129() { [ $PARALLEL == "yes" ] && skip "skip parallel run" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.5.56) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.5.56) ]] || skip "Need MDS version with at least 2.5.56" - if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then + if [ "$mds1_FSTYPE" != ldiskfs ]; then skip_env "ldiskfs only test" fi remote_mds_nodsh && skip "remote MDS with nodsh" @@ -10740,7 +10799,7 @@ test_133a() { touch ${testdir}/${tfile} || error "touch failed" check_stats $SINGLEMDS "open" 1 check_stats $SINGLEMDS "close" 1 - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.8.54) ] && { + [ $MDS1_VERSION -ge $(version_code 2.8.54) ] && { mknod ${testdir}/${tfile}-pipe p || error "mknod failed" check_stats $SINGLEMDS "mknod" 2 } @@ -10788,7 +10847,7 @@ test_133b() { chmod 444 ${testdir}/${tfile} || error "chmod failed" check_stats $SINGLEMDS "setattr" 1 do_facet $SINGLEMDS $LCTL set_param mdt.*.md_stats=clear - if [ $(lustre_version_code $SINGLEMDS) -ne $(version_code 2.2.0) ] + if [ $MDS1_VERSION -ne $(version_code 2.2.0) ] then # LU-1740 ls -l ${testdir}/${tfile} > /dev/null|| error "ls failed" check_stats $SINGLEMDS "getattr" 1 @@ -10808,9 +10867,9 @@ test_133b() { check_stats $SINGLEMDS "statfs" 1 # check aggregated statfs (LU-10018) - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.54) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.54) ] && return 0 - [ $(lustre_version_code client) -lt $(version_code 2.11.54) ] && + [ $CLIENT_VERSION -lt $(version_code 2.11.54) ] && return 0 sleep 2 do_facet $SINGLEMDS $LCTL set_param mdt.*.md_stats=clear @@ -11126,7 +11185,7 @@ run_test 133g "Check reads/writes of server lustre proc files with bad area io" test_133h() { remote_mds_nodsh && skip "remote MDS with nodsh" remote_ost_nodsh && skip "remote OST with nodsh" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.9.54) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.9.54) ]] && skip "Need MDS version at least 2.9.54" local facet @@ -11154,7 +11213,7 @@ run_test 133h "Proc files should end with newlines" test_134a() { remote_mds_nodsh && skip "remote MDS with nodsh" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.54) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.7.54) ]] && skip "Need MDS version at least 2.7.54" mkdir -p $DIR/$tdir || error "failed to create $DIR/$tdir" @@ -11190,7 +11249,7 @@ run_test 134a "Server reclaims locks when reaching lock_reclaim_threshold" test_134b() { remote_mds_nodsh && skip "remote MDS with nodsh" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.54) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.7.54) ]] && skip "Need MDS version at least 2.7.54" mkdir -p $DIR/$tdir || error "failed to create $DIR/$tdir" @@ -11537,7 +11596,7 @@ dot_lustre_fid_permission_check() { mrename $test_dir/$tdir $MOUNT/.lustre/fid && error "rename to $MOUNT/.lustre/fid should fail." - if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.51) ] + if [ $MDS1_VERSION -ge $(version_code 2.3.51) ] then # LU-3547 local old_obf_mode=$(stat --format="%a" $DIR/.lustre/fid) local new_obf_mode=777 @@ -11558,7 +11617,7 @@ dot_lustre_fid_permission_check() { $OPENFILE -f O_LOV_DELAY_CREATE:O_CREAT $test_dir/$tfile-2 fid=$($LFS path2fid $test_dir/$tfile-2) - if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.50) ] + if [ $MDS1_VERSION -ge $(version_code 2.6.50) ] then # LU-5424 echo "cp /etc/passwd $MOUNT/.lustre/fid/$fid" cp /etc/passwd $MOUNT/.lustre/fid/$fid || @@ -11576,7 +11635,7 @@ dot_lustre_fid_permission_check() { } test_154A() { - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.1) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.4.1) ]] && skip "Need MDS version at least 2.4.1" local tf=$DIR/$tfile @@ -11594,7 +11653,7 @@ test_154A() { run_test 154A "lfs path2fid and fid2path basic checks" test_154B() { - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.1) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.4.1) ]] && skip "Need MDS version at least 2.4.1" mkdir -p $DIR/$tdir || error "mkdir $tdir failed" @@ -11619,7 +11678,7 @@ run_test 154B "verify the ll_decode_linkea tool" test_154a() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ -n "$FILESET" ] && skip "SKIP due to FILESET set" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.2.51) ]] || skip "Need MDS version at least 2.2.51" [ -z "$(which setfacl)" ] && skip_env "must have setfacl tool" @@ -11650,7 +11709,7 @@ test_154b() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ -n "$FILESET" ] && skip "SKIP due to FILESET set" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.2.51) ]] || skip "Need MDS version at least 2.2.51" local remote_dir=$DIR/$tdir/remote_dir @@ -11674,7 +11733,7 @@ test_154b() { run_test 154b "Open-by-FID for remote directory" test_154c() { - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.1) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.4.1) ]] && skip "Need MDS version at least 2.4.1" touch $DIR/$tfile.1 $DIR/$tfile.2 $DIR/$tfile.3 @@ -11703,7 +11762,7 @@ run_test 154c "lfs path2fid and fid2path multiple arguments" test_154d() { remote_mds_nodsh && skip "remote MDS with nodsh" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.5.53) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.5.53) ]] && skip "Need MDS version at least 2.5.53" if remote_mds; then @@ -11737,7 +11796,7 @@ run_test 154d "Verify open file fid" test_154e() { - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.6.50) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.6.50) ]] && skip "Need MDS version at least 2.6.50" if ls -a $MOUNT | grep -q '^\.lustre$'; then @@ -11828,8 +11887,8 @@ run_test 154f "get parent fids by reading link ea" test_154g() { [ -n "$FILESET" ] && skip "SKIP due to FILESET set" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.92) && \ - $(lustre_version_code client) -gt $(version_code 2.6.99) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.6.92) && + $CLIENT_VERSION -gt $(version_code 2.6.99) ]] || skip "Need MDS version at least 2.6.92" mkdir -p $DIR/$tdir @@ -12022,8 +12081,9 @@ run_test 155h "Verify big file correctness: read cache:off write_cache:off" test_156() { [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_ost_nodsh && skip "remote OST with nodsh" - [ "$(facet_fstype ost1)" = "zfs" -a \ - $(lustre_version_code ost1 -lt $(version_code 2.6.93)) ] && + [ $OST1_VERSION -lt $(version_code 2.6.93) ] && + skip "stats not implemented on old servers" + [ "$ost1_FSTYPE" = "zfs" ] && skip "LU-1956/LU-2261: stats not implemented on OSD ZFS" local CPAGES=3 @@ -12168,7 +12228,7 @@ run_test 156 "Verification of tunables" test_160a() { [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] || + [ $MDS1_VERSION -ge $(version_code 2.2.0) ] || skip "Need MDS version at least 2.2.0" changelog_register || error "changelog_register failed" @@ -12288,7 +12348,7 @@ run_test 160a "changelog sanity" test_160b() { # LU-3587 [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] || + [ $MDS1_VERSION -ge $(version_code 2.2.0) ] || skip "Need MDS version at least 2.2.0" changelog_register || error "changelog_register failed" @@ -12314,14 +12374,13 @@ test_160c() { [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" - local rc=0 - local server_version=$(lustre_version_code $SINGLEMDS) - - [[ $server_version -gt $(version_code 2.5.57) ]] || - [[ $server_version -gt $(version_code 2.5.1) && - $server_version -lt $(version_code 2.5.50) ]] || + [[ $MDS1_VERSION -gt $(version_code 2.5.57) ]] || + [[ $MDS1_VERSION -gt $(version_code 2.5.1) && + $MDS1_VERSION -lt $(version_code 2.5.50) ]] || skip "Need MDS version at least 2.5.58 or 2.5.2+" + local rc=0 + # Registration step changelog_register || error "changelog_register failed" @@ -12342,7 +12401,7 @@ test_160d() { remote_mds_nodsh && skip "remote MDS with nodsh" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" [ $PARALLEL == "yes" ] && skip "skip parallel run" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.7.60) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.7.60) ]] || skip "Need MDS version at least 2.7.60" # Registration step @@ -12389,8 +12448,8 @@ run_test 160e "changelog negative testing (should return errors)" test_160f() { remote_mds_nodsh && skip "remote MDS with nodsh" && return - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] || - { skip "Need MDS version at least 2.10.56"; return 0; } + [[ $MDS1_VERSION -ge $(version_code 2.10.56) ]] || + skip "Need MDS version at least 2.10.56" local mdts=$(comma_list $(mdts_nodes)) @@ -12503,7 +12562,7 @@ run_test 160f "changelog garbage collect (timestamped users)" test_160g() { remote_mds_nodsh && skip "remote MDS with nodsh" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.10.56) ]] || skip "Need MDS version at least 2.10.56" local mdts=$(comma_list $(mdts_nodes)) @@ -12530,7 +12589,10 @@ test_160g() { local nbcl=$(changelog_dump | wc -l) [[ $nbcl -eq 0 ]] && error "no changelogs found" - for param in "changelog_max_idle_indexes=$((nbcl / 2))" \ + # reduce the max_idle_indexes value to make sure we exceed it + max_ndx=$((nbcl / 2 - 1)) + + for param in "changelog_max_idle_indexes=$max_ndx" \ "changelog_gc=1" \ "changelog_min_gc_interval=2" \ "changelog_min_free_cat_entries=3"; do @@ -12617,8 +12679,8 @@ run_test 160g "changelog garbage collect (old users)" test_160h() { remote_mds_nodsh && skip "remote MDS with nodsh" && return - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] || - { skip "Need MDS version at least 2.10.56"; return 0; } + [[ $MDS1_VERSION -ge $(version_code 2.10.56) ]] || + skip "Need MDS version at least 2.10.56" local mdts=$(comma_list $(mdts_nodes)) @@ -12931,7 +12993,7 @@ run_test 161b "link ea sanity under remote directory" test_161c() { remote_mds_nodsh && skip "remote MDS with nodsh" [ $PARALLEL == "yes" ] && skip "skip parallel run" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.1.5) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.1.5) ]] && skip "Need MDS version at least 2.1.5" # define CLF_RENAME_LAST 0x0001 @@ -13004,6 +13066,7 @@ run_test 161c "check CL_RENME[UNLINK] changelog record flags" test_161d() { remote_mds_nodsh && skip "remote MDS with nodsh" + [ -n "$FILESET" ] && skip "Not functional for FILESET set" local pid local fid @@ -13133,7 +13196,7 @@ run_test 162b "striped directory path lookup sanity" # LU-4239: Verify fid2path works with paths 100 or more directories deep test_162c() { - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.51) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.7.51) ]] && skip "Need MDS version at least 2.7.51" local lpath=$tdir.local @@ -13365,7 +13428,7 @@ run_test 180b "test obdecho directly on obdfilter" test_180c() { # LU-2598 [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_ost_nodsh && skip "remote OST with nodsh" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.0) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.4.0) ]] && skip "Need MDS version at least 2.4.0" do_rpc_nodes $(facet_active_host ost1) load_module obdecho/obdecho && @@ -13437,7 +13500,7 @@ run_test 182 "Test parallel modify metadata operations ================" test_183() { # LU-2275 [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.56) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.3.56) ]] && skip "Need MDS version at least 2.3.56" mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir" @@ -13606,7 +13669,7 @@ test_184d() { run_test 184d "allow stripeless layouts swap" test_184e() { - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.94) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.6.94) ]] || skip "Need MDS version at least 2.6.94" check_swap_layouts_support [ -z "$(which getfattr 2>/dev/null)" ] && @@ -13657,7 +13720,7 @@ run_test 184f "IOC_MDC_GETFILEINFO for files with long names but no striping" test_185() { # LU-2441 # LU-3553 - no volatile file support in old servers - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.60) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.3.60) ]] || skip "Need MDS version at least 2.3.60" mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir" @@ -13694,7 +13757,7 @@ run_test 185 "Volatile file support" test_187a() { remote_mds_nodsh && skip "remote MDS with nodsh" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.0) ] && + [ $MDS1_VERSION -lt $(version_code 2.3.0) ] && skip "Need MDS version at least 2.3.0" local dir0=$DIR/$tdir/$testnum @@ -13715,7 +13778,7 @@ run_test 187a "Test data version change" test_187b() { remote_mds_nodsh && skip "remote MDS with nodsh" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.0) ] && + [ $MDS1_VERSION -lt $(version_code 2.3.0) ] && skip "Need MDS version at least 2.3.0" local dir0=$DIR/$tdir/$testnum @@ -13969,7 +14032,7 @@ jobstats_set() { test_205() { # Job stats [ $PARALLEL == "yes" ] && skip "skip parallel run" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.7.1) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.7.1) ]] || skip "Need MDS version with at least 2.7.1" remote_mgs_nodsh && skip "remote MGS with nodsh" remote_mds_nodsh && skip "remote MDS with nodsh" @@ -14047,7 +14110,7 @@ test_205() { # Job stats grep -c "job_id.*mkdir") -gt 1 ] && error "old jobstats not expired" # Ensure that jobid are present in changelog (if supported by MDS) - if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.52) ];then + if [ $MDS1_VERSION -ge $(version_code 2.6.52) ];then changelog_dump | tail -10 jobids=$(changelog_dump | tail -9 | grep -c "j=") [ $jobids -eq 9 ] || @@ -14123,7 +14186,7 @@ test_208() { # is done, this test suite should be revised. - Jinshan remote_mds_nodsh && skip "remote MDS with nodsh" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.4.52) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.4.52) ]] || skip "Need MDS version at least 2.4.52" echo "==== test 1: verify get lease work" @@ -14628,12 +14691,12 @@ test_224c() { # LU-6441 set_persistent_param_and_check client "$test_at" "$param_at" 0 set_persistent_param_and_check client "$test_timeout" "$param_timeout" 5 - #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB3 0x520 - do_facet ost1 $LCTL set_param fail_loc=0x520 + #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB3 0x520 + do_facet ost1 "$LCTL set_param fail_loc=0x520" $LFS setstripe -c 1 -i 0 $DIR/$tfile dd if=/dev/zero of=$DIR/$tfile bs=8MB count=1 sync - do_facet ost1 $LCTL set_param fail_loc=0 + do_facet ost1 "$LCTL set_param fail_loc=0" set_persistent_param_and_check client "$test_at" "$param_at" $at_max set_persistent_param_and_check client "$test_timeout" "$param_timeout" \ @@ -14651,7 +14714,7 @@ test_225a () { if [ -z ${MDSSURVEY} ]; then skip_env "mds-survey not found" fi - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ] || + [ $MDS1_VERSION -ge $(version_code 2.2.51) ] || skip "Need MDS version at least 2.2.51" local mds=$(facet_host $SINGLEMDS) @@ -14675,7 +14738,7 @@ test_225b () { if [ -z ${MDSSURVEY} ]; then skip_env "mds-survey not found" fi - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ] || + [ $MDS1_VERSION -ge $(version_code 2.2.51) ] || skip "Need MDS version at least 2.2.51" [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" @@ -14785,8 +14848,7 @@ run_test 227 "running truncated executable does not cause OOM" test_228a() { [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" - [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && - skip_env "ldiskfs only test" + [ "$mds1_FSTYPE" != "ldiskfs" ] && skip_env "ldiskfs only test" local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local myDIR=$DIR/$tdir @@ -14827,8 +14889,7 @@ run_test 228a "try to reuse idle OI blocks" test_228b() { [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" - [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && - skip_env "ldiskfs only test" + [ "$mds1_FSTYPE" != "ldiskfs" ] && skip_env "ldiskfs only test" local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local myDIR=$DIR/$tdir @@ -14877,8 +14938,7 @@ run_test 228b "idle OI blocks can be reused after MDT restart" test_228c() { [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" - [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && - skip_env "ldiskfs only test" + [ "$mds1_FSTYPE" != "ldiskfs" ] && skip_env "ldiskfs only test" local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local myDIR=$DIR/$tdir @@ -14923,7 +14983,7 @@ run_test 228c "NOT shrink the last entry in OI index node to recycle idle leaf" test_229() { # LU-2482, LU-3448 [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $OSTCOUNT -lt 2 ] && skip_env "needs >= 2 OSTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.53) ] && + [ $MDS1_VERSION -lt $(version_code 2.4.53) ] && skip "No HSM $(lustre_build_version $SINGLEMDS) MDS < 2.4.53" rm -f $DIR/$tfile @@ -14956,7 +15016,7 @@ run_test 229 "getstripe/stat/rm/attr changes work on released files" test_230a() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" local MDTIDX=1 @@ -14984,7 +15044,7 @@ run_test 230a "Create remote directory and files under the remote directory" test_230b() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" local MDTIDX=1 @@ -15152,7 +15212,7 @@ test_230c() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" remote_mds_nodsh && skip "remote MDS with nodsh" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" local MDTIDX=1 @@ -15233,10 +15293,10 @@ run_test 230c "check directory accessiblity if migration failed" test_230d() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" # LU-11235 - [ "$(facet_fstype mds1)" == "zfs" ] && skip "skip ZFS backend" + [ "$mds1_FSTYPE" == "zfs" ] && skip "skip ZFS backend" local migrate_dir=$DIR/$tdir/migrate_dir local old_index @@ -15292,7 +15352,7 @@ run_test 230d "check migrate big directory" test_230e() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" local i @@ -15340,7 +15400,7 @@ run_test 230e "migrate mulitple local link files" test_230f() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" local a_fid @@ -15391,7 +15451,7 @@ run_test 230f "migrate mulitple remote link files" test_230g() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" mkdir -p $DIR/$tdir/migrate_dir @@ -15405,7 +15465,7 @@ run_test 230g "migrate dir to non-exist MDT" test_230h() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" local mdt_index @@ -15429,7 +15489,7 @@ run_test 230h "migrate .. and root" test_230i() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" mkdir -p $DIR/$tdir/migrate_dir @@ -15444,7 +15504,7 @@ run_test 230i "lfs migrate -m tolerates trailing slashes" test_230j() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && skip "Need MDS version at least 2.11.52" $LFS mkdir -m 0 -c 1 $DIR/$tdir || error "mkdir $tdir failed" @@ -15461,7 +15521,7 @@ run_test 230j "DoM file data not changed after dir migration" test_230k() { [ $MDSCOUNT -lt 4 ] && skip "needs >= 4 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.56) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.56) ] && skip "Need MDS version at least 2.11.56" local total=20 @@ -15511,7 +15571,7 @@ run_test 230k "file data not changed after dir migration" test_230l() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.56) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.56) ] && skip "Need MDS version at least 2.11.56" $LFS mkdir -i 0 -c 1 $DIR/$tdir || error "mkdir failed" @@ -15599,7 +15659,7 @@ test_232a() { run_test 232a "failed lock should not block umount" test_232b() { - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.58) ] || + [ $MDS1_VERSION -ge $(version_code 2.10.58) ] || skip "Need MDS version at least 2.10.58" mkdir -p $DIR/$tdir @@ -15623,7 +15683,7 @@ test_232b() { run_test 232b "failed data version lock should not block umount" test_233a() { - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.64) ] || + [ $MDS1_VERSION -ge $(version_code 2.3.64) ] || skip "Need MDS version at least 2.3.64" [ -n "$FILESET" ] && skip_env "SKIP due to FILESET set" @@ -15635,7 +15695,7 @@ test_233a() { run_test 233a "checking that OBF of the FS root succeeds" test_233b() { - [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.5.90) ] || + [ $MDS1_VERSION -ge $(version_code 2.5.90) ] || skip "Need MDS version at least 2.5.90" [ -n "$FILESET" ] && skip_env "SKIP due to FILESET set" @@ -15671,7 +15731,7 @@ test_234() { run_test 234 "xattr cache should not crash on ENOMEM" test_235() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.52) ] && + [ $MDS1_VERSION -lt $(version_code 2.4.52) ] && skip "Need MDS version at least 2.4.52" flock_deadlock $DIR/$tfile @@ -15718,11 +15778,9 @@ run_test 236 "Layout swap on open unlinked file" # LU-4659 linkea consistency test_238() { - local server_version=$(lustre_version_code $SINGLEMDS) - - [[ $server_version -gt $(version_code 2.5.57) ]] || - [[ $server_version -gt $(version_code 2.5.1) && - $server_version -lt $(version_code 2.5.50) ]] || + [[ $MDS1_VERSION -gt $(version_code 2.5.57) ]] || + [[ $MDS1_VERSION -gt $(version_code 2.5.1) && + $MDS1_VERSION -lt $(version_code 2.5.50) ]] || skip "Need MDS version at least 2.5.58 or 2.5.2+" touch $DIR/$tfile @@ -15741,7 +15799,7 @@ test_238() { run_test 238 "Verify linkea consistency" test_239A() { # was test_239 - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.5.60) ] && + [ $MDS1_VERSION -lt $(version_code 2.5.60) ] && skip "Need MDS version at least 2.5.60" local list=$(comma_list $(mdts_nodes)) @@ -15749,7 +15807,7 @@ test_239A() { # was test_239 mkdir -p $DIR/$tdir createmany -o $DIR/$tdir/f- 5000 unlinkmany $DIR/$tdir/f- 5000 - [ $(lustre_version_code $SINGLEMDS) -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) @@ -15910,7 +15968,7 @@ run_test 245 "check mdc connection flag/data: multiple modify RPCs" test_246() { # LU-7371 remote_ost_nodsh && skip "remote OST with nodsh" - [ $(lustre_version_code ost1) -lt $(version_code 2.7.62) ] && + [ $OST1_VERSION -lt $(version_code 2.7.62) ] && skip "Need OST version >= 2.7.62" do_facet ost1 $LCTL set_param fail_val=4095 @@ -16069,7 +16127,7 @@ test_248() { run_test 248 "fast read verification" test_249() { # LU-7890 - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.53) ] && + [ $MDS1_VERSION -lt $(version_code 2.8.53) ] && skip "Need at least version 2.8.54" rm -f $DIR/$tfile @@ -16114,8 +16172,7 @@ run_test 251 "Handling short read and write correctly" test_252() { remote_mds_nodsh && skip "remote MDS with nodsh" remote_ost_nodsh && skip "remote OST with nodsh" - if [ "$(facet_fstype ost1)" != "ldiskfs" -o \ - "$(facet_fstype mds1)" != "ldiskfs" ]; then + if [ "$ost1_FSTYPE" != "ldiskfs" -o "$mds1_FSTYPE" != "ldiskfs" ]; then skip_env "ldiskfs only test" fi @@ -16430,7 +16487,7 @@ ladvise_willread_performance() # the test won't work on ZFS until it supports 'ladvise dontneed', but # it is still good to run until then to exercise 'ladvise willread' ! $LFS ladvise -a dontneed $DIR/$tfile && - [ "$(facet_fstype ost1)" = "zfs" ] && + [ "$ost1_FSTYPE" = "zfs" ] && echo "osd-zfs does not support dontneed or drop_caches" && return 0 @@ -16441,7 +16498,7 @@ ladvise_willread_performance() } test_255a() { - [ $(lustre_version_code ost1) -lt $(version_code 2.8.54) ] && + [ $OST1_VERSION -lt $(version_code 2.8.54) ] && skip "lustre < 2.8.54 does not support ladvise " remote_ost_nodsh && skip "remote OST with nodsh" @@ -16528,7 +16585,7 @@ facet_meminfo() { } test_255b() { - [ $(lustre_version_code ost1) -lt $(version_code 2.8.54) ] && + [ $OST1_VERSION -lt $(version_code 2.8.54) ] && skip "lustre < 2.8.54 does not support ladvise " remote_ost_nodsh && skip "remote OST with nodsh" @@ -16541,7 +16598,7 @@ test_255b() { skip "ladvise ioctl is not supported" ! $LFS ladvise -a dontneed $DIR/$tfile && - [ "$(facet_fstype ost1)" = "zfs" ] && + [ "$ost1_FSTYPE" = "zfs" ] && skip "zfs-osd does not support 'ladvise dontneed'" local size_mb=100 @@ -16591,7 +16648,7 @@ test_255b() { run_test 255b "check 'lfs ladvise -a dontneed'" test_255c() { - [ $(lustre_version_code ost1) -lt $(version_code 2.10.50) ] && + [ $OST1_VERSION -lt $(version_code 2.10.50) ] && skip "lustre < 2.10.53 does not support lockahead" local count @@ -16641,7 +16698,7 @@ test_255c() { cancel_lru_locks osc count=$($LCTL get_param -n \ - ldlm.namespaces.$FSNAME-OST0000*osc-f*.lock_unused_count) + ldlm.namespaces.$FSNAME-OST0000*osc-[-0-9a-f]*.lock_unused_count) lockahead_test -d $DIR/$tdir -t $i -f $tfile rc=$? @@ -16650,7 +16707,7 @@ test_255c() { fi new_count=$($LCTL get_param -n \ - ldlm.namespaces.$FSNAME-OST0000*osc-f*.lock_unused_count) + ldlm.namespaces.$FSNAME-OST0000*osc-[-0-9a-f]*.lock_unused_count) difference="$((new_count - count))" # Test 15 output is divided by 100 to map down to valid return @@ -16677,8 +16734,7 @@ run_test 255c "suite of ladvise lockahead tests" test_256() { [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" - [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && - skip "ldiskfs only test" + [ "$mds1_FSTYPE" != "ldiskfs" ] && skip "ldiskfs only test" changelog_users $SINGLEMDS | grep "^cl" && skip "active changelog user" @@ -16732,7 +16788,7 @@ run_test 256 "Check llog delete for empty and not full state" test_257() { remote_mds_nodsh && skip "remote MDS with nodsh" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.55) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.8.55) ]] && skip "Need MDS version at least 2.8.55" test_mkdir $DIR/$tdir @@ -16750,6 +16806,7 @@ test_257() { stop $facet || error "stop MDS failed" start $facet $(mdsdevname $((mdtidx + 1))) $MDS_MOUNT_OPTS || error "start MDS fail" + wait_recovery_complete $facet } run_test 257 "xattr locks are not lost" @@ -16791,8 +16848,7 @@ test_259() { local before local after - [ "$(facet_fstype mds1)" != "ldiskfs" ] && - skip "ldiskfs only test" && return + [ "$mds1_FSTYPE" != "ldiskfs" ] && skip "ldiskfs only test" stack_trap "rm -f $file" EXIT @@ -16835,7 +16891,7 @@ run_test 260 "Check mdc_close fail" ### Data-on-MDT sanity tests ### test_270a() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55 for DoM" # create DoM file @@ -16950,7 +17006,7 @@ test_270a() { run_test 270a "DoM: basic functionality tests" test_270b() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" local dom=$DIR/$tdir/dom_file @@ -16975,7 +17031,7 @@ test_270b() { run_test 270b "DoM: maximum size overflow checks for DoM-only file" test_270c() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" mkdir -p $DIR/$tdir @@ -17004,7 +17060,7 @@ test_270c() { run_test 270c "DoM: DoM EA inheritance tests" test_270d() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" mkdir -p $DIR/$tdir @@ -17026,7 +17082,7 @@ test_270d() { run_test 270d "DoM: change striping from DoM to RAID0" test_270e() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" mkdir -p $DIR/$tdir/dom @@ -17067,7 +17123,7 @@ test_270e() { run_test 270e "DoM: lfs find with DoM files test" test_270f() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" local mdtname=${FSNAME}-MDT0000-mdtlov @@ -17149,7 +17205,7 @@ test_270f() { run_test 270f "DoM: maximum DoM stripe size checks" test_271a() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" local dom=$DIR/$tdir/dom @@ -17169,7 +17225,7 @@ test_271a() { run_test 271a "DoM: data is cached for read after write" test_271b() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" local dom=$DIR/$tdir/dom @@ -17191,7 +17247,7 @@ test_271b() { run_test 271b "DoM: no glimpse RPC for stat (DoM only file)" test_271ba() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" local dom=$DIR/$tdir/dom @@ -17229,7 +17285,7 @@ get_mdc_stats() { } test_271c() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.55) ] && skip "Need MDS version at least 2.10.55" local dom=$DIR/$tdir/dom @@ -17274,8 +17330,8 @@ cleanup_271def_tests() { } test_271d() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.57) ] && - skip "Need MDS version at least 2.10.57" && return + [ $MDS1_VERSION -lt $(version_code 2.10.57) ] && + skip "Need MDS version at least 2.10.57" local dom=$DIR/$tdir/dom local tmp=$TMP/$tfile @@ -17330,8 +17386,8 @@ test_271d() { run_test 271d "DoM: read on open (1K file in reply buffer)" test_271e() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.57) ] && - skip "Need MDS version at least 2.10.57" && return + [ $MDS1_VERSION -lt $(version_code 2.10.57) ] && + skip "Need MDS version at least 2.10.57" local dom=$DIR/$tdir/dom local tmp=$TMP/${tfile}.data @@ -17385,8 +17441,8 @@ test_271e() { run_test 271e "DoM: read on open (30K file with reply buffer adjusting)" test_271f() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.57) ] && - skip "Need MDS version at least 2.10.57" && return + [ $MDS1_VERSION -lt $(version_code 2.10.57) ] && + skip "Need MDS version at least 2.10.57" local dom=$DIR/$tdir/dom local tmp=$TMP/$tfile @@ -17439,7 +17495,7 @@ test_271f() { run_test 271f "DoM: read on open (200K file and read tail)" test_272a() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.50) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.50) ] && skip "Need MDS version at least 2.11.50" local dom=$DIR/$tdir/dom @@ -17453,19 +17509,18 @@ test_272a() { $LFS migrate -E 256K -L mdt -E -1 -c2 $dom || error "failed to migrate to the same DoM component" - [ $($LFS getstripe -c $dom) -eq 2 ] || - error "layout was not changed silently" - local new_md5=$(md5sum $dom) - [ "$old_md5" != "$new_md5" ] && + [ "$old_md5" == "$new_md5" ] || error "md5sum differ: $old_md5, $new_md5" - return 0 + + [ $($LFS getstripe -c $dom) -eq 2 ] || + error "migrate stripe count bad: $(LFS getstripe -c $dom) != 2" } run_test 272a "DoM migration: new layout with the same DOM component" test_272b() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.50) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.50) ] && skip "Need MDS version at least 2.11.50" local dom=$DIR/$tdir/dom @@ -17507,7 +17562,7 @@ test_272b() { run_test 272b "DoM migration: DOM file to the OST-striped file (plain)" test_272c() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.50) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.50) ] && skip "Need MDS version at least 2.11.50" local dom=$DIR/$tdir/$tfile @@ -17547,7 +17602,7 @@ test_272c() { run_test 272c "DoM migration: DOM file to the OST-striped file (composite)" test_273a() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.50) ] && + [ $MDS1_VERSION -lt $(version_code 2.11.50) ] && skip "Need MDS version at least 2.11.50" # Layout swap cannot be done if either file has DOM component, @@ -17574,7 +17629,7 @@ run_test 273a "DoM: layout swapping should fail with DOM" test_275() { remote_ost_nodsh && skip "remote OST with nodsh" - [ $(lustre_version_code ost1) -lt $(version_code 2.10.57) ] && + [ $OST1_VERSION -lt $(version_code 2.10.57) ] && skip "Need OST version >= 2.10.57" local file=$DIR/$tfile @@ -17697,7 +17752,7 @@ test_striped_dir() { } test_300a() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.0) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.0) ] && skip "skipped for lustre < 2.7.0" [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" @@ -17708,7 +17763,7 @@ test_300a() { run_test 300a "basic striped dir sanity test" test_300b() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.0) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.0) ] && skip "skipped for lustre < 2.7.0" [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" @@ -17737,7 +17792,7 @@ test_300b() { run_test 300b "check ctime/mtime for striped dir" test_300c() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.0) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.0) ] && skip "skipped for lustre < 2.7.0" [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" @@ -17763,7 +17818,7 @@ test_300c() { run_test 300c "chown && check ls under striped directory" test_300d() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.0) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.0) ] && skip "skipped for lustre < 2.7.0" [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" @@ -17797,7 +17852,7 @@ test_300d() { run_test 300d "check default stripe under striped directory" test_300e() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" @@ -17846,7 +17901,7 @@ run_test 300e "check rename under striped directory" test_300f() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" local stripe_count @@ -17935,7 +17990,7 @@ test_300_check_default_striped_dir() test_300g() { [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" local dir @@ -17987,7 +18042,7 @@ run_test 300g "check default striped directory for normal directory" test_300h() { [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" local dir @@ -18018,7 +18073,7 @@ run_test 300h "check default striped directory for striped directory" test_300i() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" local stripe_count @@ -18073,7 +18128,7 @@ run_test 300i "client handle unknown hash type striped directory" test_300j() { [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" [ $PARALLEL == "yes" ] && skip "skip parallel run" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" local stripe_count @@ -18100,9 +18155,14 @@ run_test 300j "test large update record" test_300k() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" + # this test needs a huge transaction + local kb + kb=$(do_facet $SINGLEMDS lctl get_param -n osd*.lustre-MDT0000.kbytestotal) + [ $kb -lt $((1024*1024)) ] && skip "too small mds: $kb" + local stripe_count local file @@ -18126,7 +18186,7 @@ run_test 300k "test large striped directory" test_300l() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" local stripe_index @@ -18150,7 +18210,7 @@ run_test 300l "non-root user to create dir under striped dir with stale layout" test_300m() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -ge 2 ] && skip_env "Only for single MDT" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" mkdir -p $DIR/$tdir/striped_dir @@ -18192,7 +18252,7 @@ cleanup_300n() { test_300n() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" remote_mds_nodsh && skip "remote MDS with nodsh" @@ -18235,7 +18295,7 @@ run_test 300n "non-root user to create dir under striped dir with default EA" test_300o() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.55) ] && + [ $MDS1_VERSION -lt $(version_code 2.7.55) ] && skip "Need MDS version at least 2.7.55" local numfree1 @@ -18416,11 +18476,12 @@ run_test 310c "open-unlink remote file with multiple links" test_311() { [ $PARALLEL == "yes" ] && skip "skip parallel run" [ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.54) ] && + [ $MDS1_VERSION -lt $(version_code 2.8.54) ] && skip "lustre < 2.8.54 does not contain LU-4825 fix" remote_mds_nodsh && skip "remote MDS with nodsh" local old_iused=$($LFS df -i | grep OST0000 | awk '{ print $3 }') + local mdts=$(comma_list $(mdts_nodes)) mkdir -p $DIR/$tdir $LFS setstripe -i 0 -c 1 $DIR/$tdir @@ -18429,14 +18490,11 @@ test_311() { # statfs data is not real time, let's just calculate it old_iused=$((old_iused + 1000)) - local count=$(do_facet $SINGLEMDS "lctl get_param -n \ + local count=$(do_facet $SINGLEMDS "$LCTL get_param -n \ osp.*OST0000*MDT0000.create_count") - local max_count=$(do_facet $SINGLEMDS "lctl get_param -n \ + local max_count=$(do_facet $SINGLEMDS "$LCTL get_param -n \ osp.*OST0000*MDT0000.max_create_count") - for idx in $(seq $MDSCOUNT); do - do_facet mds$idx "lctl set_param -n \ - osp.*OST0000*MDT000?.max_create_count=0" - done + do_nodes $mdts "$LCTL set_param -n osp.*OST0000*.max_create_count=0" $LFS setstripe -i 0 $DIR/$tdir/$tfile || error "setstripe failed" local index=$($LFS getstripe -i $DIR/$tdir/$tfile) @@ -18444,12 +18502,13 @@ test_311() { unlinkmany $DIR/$tdir/$tfile. 1000 - for idx in $(seq $MDSCOUNT); do - do_facet mds$idx "lctl set_param -n \ - osp.*OST0000*MDT000?.max_create_count=$max_count" - do_facet mds$idx "lctl set_param -n \ - osp.*OST0000*MDT000?.create_count=$count" - done + do_nodes $mdts "$LCTL set_param -n \ + osp.*OST0000*.max_create_count=$max_count" + [ $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" | + grep "=0" && error "create_count is zero" local new_iused for i in $(seq 120); do @@ -18502,7 +18561,7 @@ zfs_object_blksz() { test_312() { # LU-4856 remote_ost_nodsh && skip "remote OST with nodsh" - [ $(facet_fstype ost1) = "zfs" ] || + [ "$ost1_FSTYPE" = "zfs" ] || skip_env "the test only applies to zfs" local max_blksz=$(do_facet ost1 \ @@ -18628,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 @@ -18761,7 +18822,7 @@ run_test 399a "fake write should not be slower than normal write" test_399b() { # LU-8726 for OST fake read remote_ost_nodsh && skip "remote OST with nodsh" - if [ "$(facet_fstype ost1)" != "ldiskfs" ]; then + if [ "$ost1_FSTYPE" != "ldiskfs" ]; then skip_env "ldiskfs only test" fi @@ -18921,12 +18982,11 @@ test_401d() { run_test 401d "Verify 'lctl set_param' accepts values containing '='" test_402() { - local server_version=$(lustre_version_code $SINGLEMDS) - [[ $server_version -ge $(version_code 2.7.66) ]] || - [[ $server_version -ge $(version_code 2.7.18.4) && - $server_version -lt $(version_code 2.7.50) ]] || - [[ $server_version -ge $(version_code 2.7.2) && - $server_version -lt $(version_code 2.7.11) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.7.66) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.7.18.4) && + $MDS1_VERSION -lt $(version_code 2.7.50) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.7.2) && + $MDS1_VERSION -lt $(version_code 2.7.11) ]] || skip "Need MDS version 2.7.2+ or 2.7.18.4+ or 2.7.66+" remote_mds_nodsh && skip "remote MDS with nodsh" @@ -18968,8 +19028,7 @@ test_403() { run_test 403 "i_nlink should not drop to zero due to aliasing" test_404() { # LU-6601 - local server_version=$(lustre_version_code $SINGLEMDS) - [[ $server_version -ge $(version_code 2.8.53) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.8.53) ]] || skip "Need server version newer than 2.8.52" remote_mds_nodsh && skip "remote MDS with nodsh" @@ -18999,8 +19058,9 @@ test_404() { # LU-6601 run_test 404 "validate manual {de}activated works properly for OSPs" test_405() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.6.92) -o \ - [ $(lustre_version_code client) -lt $(version_code 2.6.99) ] && + [ -n "$FILESET" ] && skip "Not functional for FILESET set" + [ $MDS1_VERSION -lt $(version_code 2.6.92) -o \ + [ $CLIENT_VERSION -lt $(version_code 2.6.99) ] && skip "Layout swap lock is not supported" check_swap_layouts_support @@ -19015,7 +19075,7 @@ test_406() { [ $OSTCOUNT -lt 2 ] && skip_env "needs >= 2 OSTs" [ -n "$FILESET" ] && skip "SKIP due to FILESET set" [ $PARALLEL == "yes" ] && skip "skip parallel run" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.50) ] && + [ $MDS1_VERSION -lt $(version_code 2.8.50) ] && skip "Need MDS version at least 2.8.50" local def_stripe_size=$($LFS getstripe -S $MOUNT) @@ -19085,7 +19145,7 @@ run_test 406 "DNE support fs default striping" test_407() { [ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs" - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.55) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.8.55) ]] && skip "Need MDS version at least 2.8.55" remote_mds_nodsh && skip "remote MDS with nodsh" @@ -19158,7 +19218,7 @@ run_test 409 "Large amount of cross-MDTs hard links on the same file" test_410() { - [[ $(lustre_version_code client) -lt $(version_code 2.9.59) ]] && + [[ $CLIENT_VERSION -lt $(version_code 2.9.59) ]] && skip "Need client version at least 2.9.59" # Create a file, and stat it from the kernel @@ -19288,7 +19348,7 @@ test_415() { total=500 # this test may be slow on ZFS - [ "$(facet_fstype mds1)" == "zfs" ] && total=100 + [ "$mds1_FSTYPE" == "zfs" ] && total=100 # though this test is designed for striped directory, let's test normal # directory too since lock is always saved as CoS lock. @@ -19341,9 +19401,9 @@ cleanup_417() { } test_417() { - [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.56) ]] && - skip "Need MDS version at least 2.11.56" && return + [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" + [[ $MDS1_VERSION -lt $(version_code 2.11.56) ]] && + skip "Need MDS version at least 2.11.56" trap cleanup_417 RETURN EXIT @@ -19366,9 +19426,95 @@ test_417() { } run_test 417 "disable remote dir, striped dir and dir migration" +# Checks that the outputs of df [-i] and lfs df [-i] match +# +# usage: check_lfs_df +check_lfs_df() { + local dir=$2 + local inodes + local df_out + local lfs_df_out + local tries=100 + local count=0 + local passed=false + + # blocks or inodes + [ "$1" == "blocks" ] && inodes= || inodes="-i" + + while (( count < tries )); do + cancel_lru_locks + sync; sleep 0.2 + + # read the lines of interest + df_out=($(df $inodes $dir | tail -n +2)) || + error "df $inodes $dir | tail -n +2 failed" + lfs_df_out=($($LFS df $inodes $dir | grep summary:)) || + error "lfs df $inodes $dir | grep summary: failed" + + # skip first substrings of each output as they are different + # ://dev/null || + error "creating 1 file in $dir failed" + check_lfs_df blocks $dir + check_lfs_df inodes $dir + + # create a random number of files + echo "Creating $((numfiles - 1)) files and testing" + createmany -o $dir/$tfile- 1 $((numfiles - 1)) &>/dev/null || + error "creating $((numfiles - 1)) files in $dir failed" + + # write a random number of blocks to the first test file + echo "Writing $numblocks 4K blocks and testing" + dd if=/dev/urandom of=$dir/${tfile}-0 bs=4K conv=fsync \ + count=$numblocks &>/dev/null || + error "dd to $dir/${tfile}-0 failed" + + # retest + check_lfs_df blocks $dir + check_lfs_df inodes $dir + + unlinkmany $dir/$tfile- $numfiles &>/dev/null || + error "unlinking $numfiles files in $dir failed" +} +run_test 418 "df and lfs df outputs match" + prep_801() { [[ $(lustre_version_code mds1) -lt $(version_code 2.9.55) ]] || - [[ $(lustre_version_code ost1) -lt $(version_code 2.9.55) ]] && + [[ $OST1_VERSION -lt $(version_code 2.9.55) ]] && skip "Need server version at least 2.9.55" start_full_debug_logging @@ -19379,7 +19525,7 @@ post_801() { } barrier_stat() { - if [ $(lustre_version_code mgs) -le $(version_code 2.10.0) ]; then + if [ $MGS_VERSION -le $(version_code 2.10.0) ]; then local st=$(do_facet mgs $LCTL barrier_stat $FSNAME | awk '/The barrier for/ { print $7 }') echo $st @@ -19392,7 +19538,7 @@ barrier_stat() { barrier_expired() { local expired - if [ $(lustre_version_code mgs) -le $(version_code 2.10.0) ]; then + if [ $MGS_VERSION -le $(version_code 2.10.0) ]; then expired=$(do_facet mgs $LCTL barrier_stat $FSNAME | awk '/will be expired/ { print $7 }') else @@ -19581,7 +19727,7 @@ saved_MGS_MOUNT_OPTS=$MGS_MOUNT_OPTS saved_MDS_MOUNT_OPTS=$MDS_MOUNT_OPTS saved_OST_MOUNT_OPTS=$OST_MOUNT_OPTS -cleanup_802() { +cleanup_802a() { trap 0 stopall @@ -19591,10 +19737,10 @@ cleanup_802() { setupall } -test_802() { +test_802a() { [[ $(lustre_version_code mds1) -lt $(version_code 2.9.55) ]] || - [[ $(lustre_version_code ost1) -lt $(version_code 2.9.55) ]] && + [[ $OST1_VERSION -lt $(version_code 2.9.55) ]] && skip "Need server version at least 2.9.55" [[ $ENABLE_QUOTA ]] && skip "Quota enabled for read-only test" @@ -19604,7 +19750,7 @@ test_802() { cp $LUSTRE/tests/test-framework.sh $DIR/$tdir/ || error "(2) Fail to copy" - trap cleanup_802 EXIT + trap cleanup_802a EXIT # sync by force before remount as readonly sync; sync_all_data; sleep 3; sync_all_data @@ -19633,13 +19779,44 @@ test_802() { diff $LUSTRE/tests/test-framework.sh $DIR/$tdir/test-framework.sh || error "(7) Read should succeed under ro mode" - cleanup_802 + cleanup_802a } -run_test 802 "simulate readonly device" +run_test 802a "simulate readonly device" + +test_802b() { + [ $PARALLEL == "yes" ] && skip "skip parallel run" + remote_mds_nodsh && skip "remote MDS with nodsh" + + do_facet $SINGLEMDS $LCTL get_param mdt.*.readonly || + skip "readonly option not available" + + $LFS mkdir -i 0 -c 1 $DIR/$tdir || error "(1) fail to mkdir" + + cp $LUSTRE/tests/test-framework.sh $DIR/$tdir/ || + error "(2) Fail to copy" + + # write back all cached data before setting MDT to readonly + cancel_lru_locks + sync_all_data + + do_facet $SINGLEMDS $LCTL set_param mdt.*.readonly=1 + stack_trap "do_facet $SINGLEMDS $LCTL set_param mdt.*.readonly=0" EXIT + + echo "Modify should be refused" + touch $DIR/$tdir/guard && error "(6) Touch should fail under ro mode" + + echo "Read should be allowed" + diff $LUSTRE/tests/test-framework.sh $DIR/$tdir/test-framework.sh || + error "(7) Read should succeed under ro mode" + + # disable readonly + do_facet $SINGLEMDS $LCTL set_param mdt.*.readonly=0 +} +run_test 802b "be able to set MDTs to readonly" test_803() { [[ $MDSCOUNT -lt 2 ]] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.54) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.54) ] && skip "MDS needs to be newer than 2.10.54" mkdir -p $DIR/$tdir @@ -19689,10 +19866,9 @@ run_test 803 "verify agent object for remote object" test_804() { [[ $MDSCOUNT -lt 2 ]] && skip_env "needs >= 2 MDTs" - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.54) ] && + [ $MDS1_VERSION -lt $(version_code 2.10.54) ] && skip "MDS needs to be newer than 2.10.54" - [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && - skip_env "ldiskfs only test" + [ "$mds1_FSTYPE" != "ldiskfs" ] && skip_env "ldiskfs only test" mkdir -p $DIR/$tdir $LFS mkdir -c 1 -i 1 $DIR/$tdir/dir0 || @@ -19778,11 +19954,10 @@ cleanup_805() { test_805() { local zfs_version=$(do_node $SINGLEMDS cat /sys/module/zfs/version) - [ "$(facet_fstype mds1)" != "zfs" ] && - skip "ZFS specific test" + [ "$mds1_FSTYPE" != "zfs" ] && skip "ZFS specific test" [ $(version_code $zfs_version) -lt $(version_code 0.7.2) ] && skip "netfree not implemented before 0.7" - [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.57) ]] || + [[ $MDS1_VERSION -ge $(version_code 2.10.57) ]] || skip "Need MDS version at least 2.10.57" local fsset @@ -19842,8 +20017,8 @@ check_lsom_size() } test_806() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && - skip "Need MDS version at least 2.11.52" && return + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && + skip "Need MDS version at least 2.11.52" local bs=1048576 @@ -19852,7 +20027,7 @@ test_806() { local save="$TMP/$TESTSUITE-$TESTNAME.parameters" save_lustre_params client "llite.*.xattr_cache" > $save lctl set_param llite.*.xattr_cache=0 - stack_trap "restore_lustre_params < $save" EXIT + stack_trap "restore_lustre_params < $save; rm -f $save" EXIT # single-threaded write echo "Test SOM for single-threaded write" @@ -19937,8 +20112,9 @@ test_806() { run_test 806 "Verify Lazy Size on MDS" test_807() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.52) ] && - skip "Need MDS version at least 2.11.52" && return + [ -n "$FILESET" ] && skip "Not functional for FILESET set" + [ $MDS1_VERSION -lt $(version_code 2.11.52) ] && + skip "Need MDS version at least 2.11.52" # Registration step changelog_register || error "changelog_register failed" @@ -19949,7 +20125,7 @@ test_807() { local save="$TMP/$TESTSUITE-$TESTNAME.parameters" save_lustre_params client "llite.*.xattr_cache" > $save lctl set_param llite.*.xattr_cache=0 - stack_trap "restore_lustre_params < $save" EXIT + stack_trap "restore_lustre_params < $save; rm -f $save" EXIT rm -rf $DIR/$tdir || error "rm $tdir failed" mkdir -p $DIR/$tdir || error "mkdir $tdir failed" @@ -20000,8 +20176,8 @@ check_som_nologged() } test_808() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.55) ] && - skip "Need MDS version at least 2.11.55" && return + [ $MDS1_VERSION -lt $(version_code 2.11.55) ] && + skip "Need MDS version at least 2.11.55" # Registration step changelog_register || error "changelog_register failed" @@ -20031,8 +20207,8 @@ check_som_nodata() } test_809() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.11.56) ] && - skip "Need MDS version at least 2.11.56" && return + [ $MDS1_VERSION -lt $(version_code 2.11.56) ] && + skip "Need MDS version at least 2.11.56" $LFS setstripe -E 1M -L mdt $DIR/$tfile || error "failed to create DoM-only file $DIR/$tfile"