X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=613b5082d809b3f520288185a3fab821765c4d7b;hp=a591d29d5609f4e241c04e7761b09624068f49ce;hb=0a714ba01bbcdb43fa2d07e88652be2b8fb1c52f;hpb=e793a03c2ad2066de5e3b024fc2b368c38e8dc24 diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index a591d29..613b508 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -248,7 +248,7 @@ test_6a() { run_test 6a "touch .../f6a; chmod .../f6a ======================" test_6b() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return if [ ! -f $DIR/f6a ]; then touch $DIR/f6a chmod 0666 $DIR/f6a @@ -259,7 +259,7 @@ test_6b() { run_test 6b "$RUNAS chmod .../f6a (should return error) ==" test_6c() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return touch $DIR/f6c chown $RUNAS_ID $DIR/f6c || error $CHECKSTAT -t file -u \#$RUNAS_ID $DIR/f6c || error @@ -267,7 +267,7 @@ test_6c() { run_test 6c "touch .../f6c; chown .../f6c ======================" test_6d() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return if [ ! -f $DIR/f6c ]; then touch $DIR/f6c chown $RUNAS_ID $DIR/f6c @@ -278,7 +278,7 @@ test_6d() { run_test 6d "$RUNAS chown .../f6c (should return error) ==" test_6e() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return touch $DIR/f6e chgrp $RUNAS_ID $DIR/f6e || error $CHECKSTAT -t file -u \#$UID -g \#$RUNAS_ID $DIR/f6e || error @@ -286,7 +286,7 @@ test_6e() { run_test 6e "touch .../f6e; chgrp .../f6e ======================" test_6f() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return if [ ! -f $DIR/f6e ]; then touch $DIR/f6e chgrp $RUNAS_ID $DIR/f6e @@ -297,7 +297,7 @@ test_6f() { run_test 6f "$RUNAS chgrp .../f6e (should return error) ==" test_6g() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return mkdir $DIR/d6g || error chmod 777 $DIR/d6g || error $RUNAS mkdir $DIR/d6g/d || error @@ -308,7 +308,7 @@ test_6g() { run_test 6g "Is new dir in sgid dir inheriting group?" test_6h() { # bug 7331 - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return touch $DIR/f6h || error "touch failed" chown $RUNAS_ID:$RUNAS_ID $DIR/f6h || error "initial chown failed" $RUNAS -G$RUNAS_ID chown $RUNAS_ID:0 $DIR/f6h && error "chown worked" @@ -515,7 +515,7 @@ test_19b() { run_test 19b "ls -l .../f19 (should return error) ==============" test_19c() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return $RUNAS touch $DIR/f19 && error || true } run_test 19c "$RUNAS touch .../f19 (should return error) ==" @@ -879,7 +879,7 @@ test_27a() { run_test 27a "one stripe file ==================================" test_27c() { - [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return mkdir -p $DIR/d27 $SETSTRIPE $DIR/d27/f01 -c 2 || error "lstripe failed" [ `$GETSTRIPE $DIR/d27/f01 | grep -A 10 obdidx | wc -l` -eq 4 ] || @@ -956,7 +956,7 @@ test_27l() { run_test 27l "check setstripe permissions (should return error)" test_27m() { - [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs -- skipping" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" && return if [ $ORIGFREE -gt $MAXFREE ]; then skip "$ORIGFREE > $MAXFREE skipping out-of-space test on OST0" return @@ -1032,7 +1032,7 @@ exhaust_all_precreations() { } test_27n() { - [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return remote_ost_nodsh && skip "remote OST with nodsh" && return @@ -1047,7 +1047,7 @@ test_27n() { run_test 27n "create file with some full OSTs ==================" test_27o() { - [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return remote_ost_nodsh && skip "remote OST with nodsh" && return @@ -1064,7 +1064,7 @@ test_27o() { run_test 27o "create file with all full OSTs (should error) ====" test_27p() { - [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return remote_ost_nodsh && skip "remote OST with nodsh" && return @@ -1084,7 +1084,7 @@ test_27p() { run_test 27p "append to a truncated file with some full OSTs ===" test_27q() { - [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return remote_ost_nodsh && skip "remote OST with nodsh" && return @@ -1105,7 +1105,7 @@ test_27q() { run_test 27q "append to truncated file with all OSTs full (should error) ===" test_27r() { - [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return remote_ost_nodsh && skip "remote OST with nodsh" && return @@ -1141,7 +1141,7 @@ test_27t() { # bug 10864 run_test 27t "check that utils parse path correctly" test_27u() { # bug 4900 - [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return #define OBD_FAIL_MDS_OSC_PRECREATE 0x139 @@ -1160,7 +1160,7 @@ test_27u() { # bug 4900 run_test 27u "skip object creation on OSC w/o objects ==========" test_27v() { # bug 4900 - [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "too few OSTs" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return remote_ost_nodsh && skip "remote OST with nodsh" && return @@ -1195,7 +1195,7 @@ test_27w() { # bug 10997 size=`$GETSTRIPE $DIR/d27w/f0 -qs` [ $size -ne 65536 ] && error "stripe size $size != 65536" || true - [ "$OSTCOUNT" -lt "2" ] && skip "skipping multiple stripe count/offset test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping multiple stripe count/offset test" && return for i in `seq 1 $OSTCOUNT`; do offset=$(($i-1)) $LSTRIPE $DIR/d27w/f$i -c $i -i $offset || error "lstripe -c $i -i $offset failed" @@ -1208,7 +1208,7 @@ test_27w() { # bug 10997 run_test 27w "check lfs setstripe -c -s -i options =============" test_27x() { - [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs" && return DELAY=$(do_facet mds lctl get_param -n lov.*.qos_maxage | awk '{print $1 + 2}') OFFSET=$(($OSTCOUNTi - 1)) OSTIDX=0 @@ -1228,7 +1228,7 @@ test_27x() { run_test 27x "create files while OST0 is degraded" test_27y() { - [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs -- skipping" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return MDS_OSCS=`do_facet mds lctl dl | awk '/[oO][sS][cC].*md[ts]/ { print $4 }'` @@ -1809,7 +1809,7 @@ test_36d() { run_test 36d "non-root OST utime check (open, utime) ===========" test_36e() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return mkdir -p $DIR/$tdir touch $DIR/$tdir/$tfile $RUNAS utime $DIR/$tdir/$tfile && \ @@ -2103,7 +2103,7 @@ test_43c() { run_test 43c "md5sum of copy into lustre========================" test_44() { - [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return dd if=/dev/zero of=$DIR/f1 bs=4k count=1 seek=1023 dd if=$DIR/f1 bs=4k count=1 > /dev/null } @@ -2416,7 +2416,7 @@ test_51c() { run_test 51c "rmdir .../t-0 --- .../t-$NUMTEST ====================" test_51d() { - [ "$OSTCOUNT" -lt "3" ] && skip "skipping test with few OSTs" && return + [ "$OSTCOUNT" -lt "3" ] && skip_env "skipping test with few OSTs" && return mkdir -p $DIR/d51d createmany -o $DIR/d51d/t- 1000 $LFS getstripe $DIR/d51d > $TMP/files @@ -2507,8 +2507,8 @@ test_53() { run_test 53 "verify that MDS and OSTs agree on pre-creation ====" test_54a() { - [ ! -f "$SOCKETSERVER" ] && skip "no socketserver, skipping" && return - [ ! -f "$SOCKETCLIENT" ] && skip "no socketclient, skipping" && return + [ ! -f "$SOCKETSERVER" ] && skip_env "no socketserver, skipping" && return + [ ! -f "$SOCKETCLIENT" ] && skip_env "no socketclient, skipping" && return $SOCKETSERVER $DIR/socket $SOCKETCLIENT $DIR/socket || error $MUNLINK $DIR/socket @@ -2590,7 +2590,7 @@ check_fstype() { test_55() { rm -rf $DIR/d55 mkdir $DIR/d55 - check_fstype && skip "can't find fs $FSTYPE" && return + client_only && skip "Not a server" && return mount -t $FSTYPE -o loop,iopen $EXT2_DEV $DIR/d55 || error "mounting" touch $DIR/d55/foo $IOPENTEST1 $DIR/d55/foo $DIR/d55 || error "running $IOPENTEST1" @@ -2640,7 +2640,7 @@ test_56a() { # was test_56 error "lfs getstripe --obd wrong_uuid should return error message" [ "$OSTCOUNT" -lt 2 ] && \ - skip "skipping other lfs getstripe --obd test" && return + skip_env "skipping other lfs getstripe --obd test" && return FILENUM=`$GETSTRIPE --recursive $DIR/d56 | sed -n '/^[ ]*1[ ]/p' | wc -l` OBDUUID=`$GETSTRIPE --recursive $DIR/d56 | sed -n '/^[ ]*1:/p' | awk '{print $2}'` FOUND=`$GETSTRIPE -r --obd $OBDUUID $DIR/d56 | wc -l` @@ -2800,7 +2800,7 @@ test_56o() { run_test 56o "check lfs find -mtime for old files ==========================" test_56p() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return TDIR=$DIR/${tdir}g rm -rf $TDIR @@ -2823,7 +2823,7 @@ test_56p() { run_test 56p "check lfs find -uid and ! -uid ===============================" test_56q() { - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return TDIR=$DIR/${tdir}g rm -rf $TDIR @@ -2913,7 +2913,7 @@ test_57b() { run_test 57b "default LOV EAs are stored inside large inodes ===" test_58() { - [ -z "$(which wiretest 2>/dev/null)" ] && skip "could not find wiretest" && return + [ -z "$(which wiretest 2>/dev/null)" ] && skip_env "could not find wiretest" && return wiretest } run_test 58 "verify cross-platform wire constants ==============" @@ -2931,7 +2931,7 @@ run_test 59 "verify cancellation of llog records async =========" TEST60_HEAD="test_60 run $RANDOM" test_60a() { - [ ! -f run-llog.sh ] && skip "missing subtest run-llog.sh" && return + [ ! -f run-llog.sh ] && skip_env "missing subtest run-llog.sh" && return log "$TEST60_HEAD - from kernel mode" sh run-llog.sh } @@ -3050,7 +3050,7 @@ test_64a () { run_test 64a "verify filter grant calculations (in kernel) =====" test_64b () { - [ ! -f oos.sh ] && skip "missing subtest oos.sh" && return + [ ! -f oos.sh ] && skip_env "missing subtest oos.sh" && return sh oos.sh $MOUNT } run_test 64b "check out-of-space detection on client ===========" @@ -3164,7 +3164,7 @@ test_65j() { # bug6367 run_test 65j "set default striping on root directory (bug 6367)=" test_65k() { # bug11679 - [ "$OSTCOUNT" -lt 2 ] && skip "too few OSTs" && return + [ "$OSTCOUNT" -lt 2 ] && skip_env "too few OSTs" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return echo "Check OST status: " @@ -3237,10 +3237,10 @@ swap_used() { # test case for lloop driver, basic function test_68a() { - [ "$UID" != 0 ] && skip "must run as root" && return + [ "$UID" != 0 ] && skip_env "must run as root" && return grep -q llite_lloop /proc/modules - [ $? -ne 0 ] && skip "can't find module llite_lloop" && return + [ $? -ne 0 ] && skip_env "can't find module llite_lloop" && return LLOOP=$TMP/lloop.`date +%s`.`date +%N` dd if=/dev/zero of=$DIR/f68a bs=4k count=1024 @@ -3258,12 +3258,12 @@ run_test 68a "lloop driver - basic test ========================" # excercise swapping to lustre by adding a high priority swapfile entry # and then consuming memory until it is used. test_68b() { # was test_68 - [ "$UID" != 0 ] && skip "must run as root" && return + [ "$UID" != 0 ] && skip_env "must run as root" && return lctl get_param -n devices | grep -q obdfilter && \ skip "local OST" && return grep -q llite_lloop /proc/modules - [ $? -ne 0 ] && skip "can't find module llite_lloop" && return + [ $? -ne 0 ] && skip_env "can't find module llite_lloop" && return [ -z "`$LCTL list_nids | grep -v tcp`" ] && \ skip "can't reliably test swap with TCP" && return @@ -3329,11 +3329,11 @@ run_test 71 "Running dbench on lustre (don't segment fault) ====" test_72() { # bug 5695 - Test that on 2.6 remove_suid works properly check_kernel_version 43 || return 0 - [ "$RUNAS_ID" = "$UID" ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ "$RUNAS_ID" = "$UID" ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return # Check that testing environment is properly set up. Skip if not FAIL_ON_ERROR=false check_runas_id_ret $RUNAS_ID $RUNAS_ID $RUNAS || { - skip "User $RUNAS_ID does not exist - skipping" + skip_env "User $RUNAS_ID does not exist - skipping" return 0 } # We had better clear the $DIR to get enough space for dd @@ -3809,7 +3809,7 @@ test_80() { # bug 10718 run_test 80 "Page eviction is equally fast at high offsets too ====" test_99a() { - [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && \ + [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && \ return mkdir -p $DIR/d99cvsroot chown $RUNAS_ID $DIR/d99cvsroot @@ -3822,7 +3822,7 @@ test_99a() { run_test 99a "cvs init =========================================" test_99b() { - [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return + [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return [ ! -d $DIR/d99cvsroot ] && test_99a cd /etc/init.d # some versions of cvs import exit(1) when asked to import links or @@ -3835,7 +3835,7 @@ test_99b() { run_test 99b "cvs import =======================================" test_99c() { - [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return + [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return [ ! -d $DIR/d99cvsroot ] && test_99b cd $DIR mkdir -p $DIR/d99reposname @@ -3845,7 +3845,7 @@ test_99c() { run_test 99c "cvs checkout =====================================" test_99d() { - [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return + [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return [ ! -d $DIR/d99cvsroot ] && test_99c cd $DIR/d99reposname $RUNAS touch foo99 @@ -3854,7 +3854,7 @@ test_99d() { run_test 99d "cvs add ==========================================" test_99e() { - [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return + [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return [ ! -d $DIR/d99cvsroot ] && test_99c cd $DIR/d99reposname $RUNAS cvs update @@ -3862,7 +3862,7 @@ test_99e() { run_test 99e "cvs update =======================================" test_99f() { - [ -z "$(which cvs 2>/dev/null)" ] && skip "could not find cvs" && return + [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return [ ! -d $DIR/d99cvsroot ] && test_99d cd $DIR/d99reposname $RUNAS cvs commit -m 'nomsg' foo99 @@ -4002,7 +4002,7 @@ ra_check_101() { } test_101b() { - [ "$OSTCOUNT" -lt "2" ] && skip "skipping stride IO stride-ahead test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping stride IO stride-ahead test" && return local STRIPE_SIZE=1048576 local STRIDE_SIZE=$((STRIPE_SIZE*OSTCOUNT)) local FILE_LENGTH=$((STRIPE_SIZE*100)) @@ -4117,10 +4117,10 @@ test_102a() { rm -f $testfile touch $testfile - [ "$UID" != 0 ] && skip "must run as root" && return - [ -z "`lctl get_param -n mdc.*-mdc-*.connect_flags | grep xattr`" ] && skip "must have user_xattr" && return + [ "$UID" != 0 ] && skip_env "must run as root" && return + [ -z "`lctl get_param -n mdc.*-mdc-*.connect_flags | grep xattr`" ] && skip_env "must have user_xattr" && return - [ -z "$(which setfattr 2>/dev/null)" ] && skip "could not find setfattr" && return + [ -z "$(which setfattr 2>/dev/null)" ] && skip_env "could not find setfattr" && return echo "set/get xattr..." setfattr -n trusted.name1 -v value1 $testfile || error @@ -4163,7 +4163,7 @@ run_test 102a "user xattr test ==================================" test_102b() { # b10930: get/set/list trusted.lov xattr echo "get/set/list trusted.lov xattr ..." - [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return local testfile=$DIR/$tfile $SETSTRIPE -s 65536 -i 1 -c 2 $testfile || error "setstripe failed" getfattr -d -m "^trusted" $testfile 2> /dev/null | \ @@ -4188,7 +4188,7 @@ run_test 102b "getfattr/setfattr for trusted.lov EAs ============" test_102c() { # b10930: get/set/list lustre.lov xattr echo "get/set/list lustre.lov xattr ..." - [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return mkdir -p $DIR/$tdir chown $RUNAS_ID $DIR/$tdir local testfile=$DIR/$tdir/$tfile @@ -4270,8 +4270,8 @@ find_lustre_tar() { test_102d() { # b10930: tar test for trusted.lov xattr TAR=$(find_lustre_tar) - [ -z "$TAR" ] && skip "lustre-aware tar is not installed" && return - [ "$OSTCOUNT" -lt "2" ] && skip "skipping N-stripe test" && return + [ -z "$TAR" ] && skip_env "lustre-aware tar is not installed" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping N-stripe test" && return setup_test102 mkdir -p $DIR/d102d $TAR xf $TMP/f102.tar -C $DIR/d102d --xattrs @@ -4283,8 +4283,8 @@ run_test 102d "tar restore stripe info from tarfile,not keep osts ===========" test_102f() { # b10930: tar test for trusted.lov xattr TAR=$(find_lustre_tar) - [ -z "$TAR" ] && skip "lustre-aware tar is not installed" && return - [ "$OSTCOUNT" -lt "2" ] && skip "skipping N-stripe test" && return + [ -z "$TAR" ] && skip_env "lustre-aware tar is not installed" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping N-stripe test" && return setup_test102 mkdir -p $DIR/d102f cd $DIR @@ -4298,7 +4298,7 @@ test_102h() { # bug 15777 [ -z $(lctl get_param -n mdc.*.connect_flags | grep xattr) ] && skip "must have user_xattr" && return [ -z "$(which setfattr 2>/dev/null)" ] && - skip "could not find setfattr" && return + skip_env "could not find setfattr" && return XBIG=trusted.big XSIZE=1024 @@ -4350,8 +4350,8 @@ run_test 102i "lgetxattr test on symbolic link ============" test_102j() { TAR=$(find_lustre_tar) - [ -z "$TAR" ] && skip "lustre-aware tar is not installed" && return - [ "$OSTCOUNT" -lt "2" ] && skip "skipping N-stripe test" && return + [ -z "$TAR" ] && skip_env "lustre-aware tar is not installed" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping N-stripe test" && return setup_test102 "$RUNAS" mkdir -p $DIR/d102j chown $RUNAS_ID $DIR/d102j @@ -4370,9 +4370,9 @@ run_acl_subtest() } test_103 () { - [ "$UID" != 0 ] && skip "must run as root" && return + [ "$UID" != 0 ] && skip_env "must run as root" && return [ -z "$(lctl get_param -n mdc.*-mdc-*.connect_flags | grep acl)" ] && skip "must have acl enabled" && return - [ -z "$(which setfacl 2>/dev/null)" ] && skip "could not find setfacl" && return + [ -z "$(which setfacl 2>/dev/null)" ] && skip_env "could not find setfacl" && return $GSS && skip "could not run under gss" && return declare -a identity_old @@ -4579,7 +4579,7 @@ free_min_max () { } test_116() { - [ "$OSTCOUNT" -lt "2" ] && skip "$OSTCOUNT < 2 OSTs" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs" && return echo -n "Free space priority " lctl get_param -n lov.*-clilov-*.qos_prio_free @@ -5051,7 +5051,7 @@ run_test 119a "Short directIO read must return actual read amount" test_119b() # bug 11737 { - [ "$OSTCOUNT" -lt "2" ] && skip "skipping 2-stripe test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return $SETSTRIPE -c 2 $DIR/$tfile || error "setstripe failed" dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 seek=1 || error "dd failed" @@ -5580,7 +5580,7 @@ run_test 125 "don't return EPROTO when a dir has a non-default striping and ACLs test_126() { # bug 12829/13455 [ -z "$(lctl get_param -n llite.*.client_type | grep local)" ] && skip "must run as local client" && return - [ "$UID" != 0 ] && echo "skipping $TESTNAME (must run as root)" && return + [ "$UID" != 0 ] && skip_env "skipping $TESTNAME (must run as root)" && return $GSS && skip "must run as gss disabled" && return $RUNAS -u 0 -g 1 touch $DIR/$tfile || error "touch failed" @@ -5737,7 +5737,7 @@ test_130a() { run_test 130a "FIEMAP (1-stripe file)" test_130b() { - [ "$OSTCOUNT" -lt "2" ] && skip "skipping FIEMAP on 2-stripe file test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping FIEMAP on 2-stripe file test" && return filefrag_op=$(filefrag -e 2>&1 | grep "invalid option") [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return @@ -5786,7 +5786,7 @@ test_130b() { run_test 130b "FIEMAP (2-stripe file)" test_130c() { - [ "$OSTCOUNT" -lt "2" ] && skip "skipping FIEMAP on 2-stripe file with hole test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping FIEMAP on 2-stripe file with hole test" && return filefrag_op=$(filefrag -e 2>&1 | grep "invalid option") [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return @@ -5841,7 +5841,7 @@ test_130c() { run_test 130c "FIEMAP (2-stripe file with hole)" test_130d() { - [ "$OSTCOUNT" -lt "3" ] && skip "skipping FIEMAP on N-stripe file test" && return + [ "$OSTCOUNT" -lt "3" ] && skip_env "skipping FIEMAP on N-stripe file test" && return filefrag_op=$(filefrag -e 2>&1 | grep "invalid option") [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return @@ -5890,7 +5890,7 @@ test_130d() { run_test 130d "FIEMAP (N-stripe file)" test_130e() { - [ "$OSTCOUNT" -lt "2" ] && skip "skipping continuation FIEMAP test" && return + [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping continuation FIEMAP test" && return filefrag_op=$(filefrag -e 2>&1 | grep "invalid option") [ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return @@ -6112,13 +6112,23 @@ test_150() { run_test 150 "truncate/append tests" function roc_hit() { - local list=$(comma_list $(osts_nodes)) - local log=$TMP/${TESTSUITE}-$TESTNAME.param - do_nodes $list "$LCTL get_param -n obdfilter.*.stats" >$log + local list=$(comma_list $(osts_nodes)) + + ACCNUM=$(do_nodes $list $LCTL get_param -n obdfilter.*.stats | \ + awk '/'cache_hit'/ {sum+=$2} END {print sum}') + echo $ACCNUM +} + +function set_cache() { + local on=1 + + if [ "$2" == "off" ]; then + on=0; + fi + local list=$(comma_list $(osts_nodes)) + do_nodes $list lctl set_param obdfilter.*.${1}_cache_enable $on - local ACCNUM=`awk '/^cache_hit/ {sum=sum+$2} END{print sum}' $log` - rm -f $log - echo $ACCNUM + cancel_lru_locks osc } test_151() { @@ -6212,6 +6222,210 @@ test_154() { } run_test 154 "Opening a file by FID" +test_155_load() { + local temp=$TMP/$tfile + local file=$DIR/$tfile + local list=$(comma_list $(osts_nodes)) + local big=$(do_nodes $list grep "cache" /proc/cpuinfo | \ + awk '{sum+=$4} END{print sum}') + + log big is $big K + + dd if=/dev/urandom of=$temp bs=6096 count=1 || \ + error "dd of=$temp bs=6096 count=1 failed" + cp $temp $file + cancel_lru_locks osc + cmp $temp $file || error "$temp $file differ" + + $TRUNCATE $temp 6000 + $TRUNCATE $file 6000 + cmp $temp $file || error "$temp $file differ (truncate1)" + + echo "12345" >>$temp + echo "12345" >>$file + cmp $temp $file || error "$temp $file differ (append1)" + + echo "12345" >>$temp + echo "12345" >>$file + cmp $temp $file || error "$temp $file differ (append2)" + + dd if=/dev/urandom of=$temp bs=$((big*2)) count=1k || \ + error "dd of=$temp bs=$((big*2)) count=1k failed" + cp $temp $file + ls -lh $temp $file + cancel_lru_locks osc + cmp $temp $file || error "$temp $file differ" + + rm -f $temp + true +} + +test_155a() { + set_cache read on + set_cache writethrough on + test_155_load +} +run_test 155a "Verification of correctness: read cache:on write_cache:on" + +test_155b() { + set_cache read on + set_cache writethrough off + test_155_load +} +run_test 155b "Verification of correctness: read cache:on write_cache:off" + +test_155c() { + set_cache read off + set_cache writethrough on + test_155_load +} +run_test 155c "Verification of correctness: read cache:off write_cache:on" + +test_155d() { + set_cache read off + set_cache writethrough off + test_155_load +} +run_test 155d "Verification of correctness: read cache:off write_cache:off " + +test_156() { + local CPAGES=3 + local BEFORE + local AFTER + local file="$DIR/$tfile" + + log "Turn on read and write cache" + set_cache read on + set_cache writethrough on + + log "Write data and read it back." + log "Read should be satisfied from the cache." + dd if=/dev/urandom of=$file bs=4k count=$CPAGES || error "dd failed" + BEFORE=`roc_hit` + cancel_lru_locks osc + cat $file >/dev/null + AFTER=`roc_hit` + if ! let "AFTER - BEFORE == CPAGES"; then + error "NOT IN CACHE: before: $BEFORE, after: $AFTER" + else + log "cache hits:: before: $BEFORE, after: $AFTER" + fi + + log "Read again; it should be satisfied from the cache." + BEFORE=$AFTER + cancel_lru_locks osc + cat $file >/dev/null + AFTER=`roc_hit` + if ! let "AFTER - BEFORE == CPAGES"; then + error "NOT IN CACHE: before: $BEFORE, after: $AFTER" + else + log "cache hits:: before: $BEFORE, after: $AFTER" + fi + + + log "Turn off the read cache and turn on the write cache" + set_cache read off + set_cache writethrough on + + log "Read again; it should be satisfied from the cache." + BEFORE=`roc_hit` + cancel_lru_locks osc + cat $file >/dev/null + AFTER=`roc_hit` + if ! let "AFTER - BEFORE == CPAGES"; then + error "NOT IN CACHE: before: $BEFORE, after: $AFTER" + else + log "cache hits:: before: $BEFORE, after: $AFTER" + fi + + log "Read again; it should not be satisfied from the cache." + BEFORE=$AFTER + cancel_lru_locks osc + cat $file >/dev/null + AFTER=`roc_hit` + if ! let "AFTER - BEFORE == 0"; then + error "IN CACHE: before: $BEFORE, after: $AFTER" + else + log "cache hits:: before: $BEFORE, after: $AFTER" + fi + + log "Write data and read it back." + log "Read should be satisfied from the cache." + dd if=/dev/urandom of=$file bs=4k count=$CPAGES || error "dd failed" + BEFORE=`roc_hit` + cancel_lru_locks osc + cat $file >/dev/null + AFTER=`roc_hit` + if ! let "AFTER - BEFORE == CPAGES"; then + error "NOT IN CACHE: before: $BEFORE, after: $AFTER" + else + log "cache hits:: before: $BEFORE, after: $AFTER" + fi + + log "Read again; it should not be satisfied from the cache." + BEFORE=$AFTER + cancel_lru_locks osc + cat $file >/dev/null + AFTER=`roc_hit` + if ! let "AFTER - BEFORE == 0"; then + error "IN CACHE: before: $BEFORE, after: $AFTER" + else + log "cache hits:: before: $BEFORE, after: $AFTER" + fi + + + log "Turn off read and write cache" + set_cache read off + set_cache writethrough off + + log "Write data and read it back" + log "It should not be satisfied from the cache." + rm -f $file + dd if=/dev/urandom of=$file bs=4k count=$CPAGES || error "dd failed" + cancel_lru_locks osc + BEFORE=`roc_hit` + cat $file >/dev/null + AFTER=`roc_hit` + if ! let "AFTER - BEFORE == 0"; then + error_ignore 20762 "IN CACHE: before: $BEFORE, after: $AFTER" + else + log "cache hits:: before: $BEFORE, after: $AFTER" + fi + + + log "Turn on the read cache and turn off the write cache" + set_cache read on + set_cache writethrough off + + log "Write data and read it back" + log "It should not be satisfied from the cache." + rm -f $file + dd if=/dev/urandom of=$file bs=4k count=$CPAGES || error "dd failed" + BEFORE=`roc_hit` + cancel_lru_locks osc + cat $file >/dev/null + AFTER=`roc_hit` + if ! let "AFTER - BEFORE == 0"; then + error_ignore 20762 "IN CACHE: before: $BEFORE, after: $AFTER" + else + log "cache hits:: before: $BEFORE, after: $AFTER" + fi + + log "Read again; it should be satisfied from the cache." + BEFORE=`roc_hit` + cancel_lru_locks osc + cat $file >/dev/null + AFTER=`roc_hit` + if ! let "AFTER - BEFORE == CPAGES"; then + error "NOT IN CACHE: before: $BEFORE, after: $AFTER" + else + log "cache hits:: before: $BEFORE, after: $AFTER" + fi + + rm -f $file +} +run_test 156 "Verification of tunables ============================" + #Changelogs err17935 () { if [ $MDSCOUNT -gt 1 ]; then @@ -6644,6 +6858,101 @@ test_214() { # for bug 20133 } run_test 214 "hash-indexed directory test - bug 20133" +test_215() { # for bug 18102 + # /proc/sys/lnet/stats should look as 11 space-separated numbers + cat /proc/sys/lnet/stats >$TMP/lnet_stats.out + sysctl lnet.stats |sed 's/^lnet.stats\ =\ //g' >$TMP/lnet_stats.sys + STATS_LINES_OUT=$(cat $TMP/lnet_stats.out|wc -l) + [ "$STATS_LINES_OUT" = 1 ] || error "/proc/sys/lnet/stats has more than 1 line: $STATS" + STATS_LINES_SYS=$(cat $TMP/lnet_stats.sys|wc -l) + [ "$STATS_LINES_SYS" = 1 ] || error "lnet.stats has more than 1 line: $STATS" + STATS_REG='^[0-9]\+ [0-9]\+ [0-9]\+ [0-9]\+ [0-9]\+ [0-9]\+ [0-9]\+ [0-9]\+ [0-9]\+ [0-9]\+ [0-9]\+$' + grep "$STATS_REG" $TMP/lnet_stats.out || (cat $TMP/lnet_stats.out && + error "/proc/sys/lnet/stats misformatted") + grep "$STATS_REG" $TMP/lnet_stats.sys || (cat $TMP/lnet_stats.sys && + error "lnet.stats misformatted") + rm -f $TMP/lnet_stats.out $TMP/lnet_stats.sys + + # /proc/sys/lnet/routes should look exactly as expected + cat /proc/sys/lnet/routes >$TMP/lnet_routes.out + sysctl lnet.routes |sed 's/^lnet.routes\ =\ //g' >$TMP/lnet_routes.sys + echo "Routing disabled" >$TMP/lnet_routes.expected + echo "net hops state router" >>$TMP/lnet_routes.expected + diff $TMP/lnet_routes.expected $TMP/lnet_routes.out || + error "/proc/sys/lnet/routes does not look as expected" + diff $TMP/lnet_routes.expected $TMP/lnet_routes.sys || + error "lnet.routes does not look as expected" + rm -f $TMP/lnet_routes.expected $TMP/lnet_routes.out $TMP/lnet_routes.sys + + # /proc/sys/lnet/routers should look exactly as expected + cat /proc/sys/lnet/routers >$TMP/lnet_routers.out + sysctl lnet.routers |sed 's/^lnet.routers\ =\ //g' >$TMP/lnet_routers.sys + echo "ref rtr_ref alive_cnt state last_ping router" >$TMP/lnet_routers.expected + diff $TMP/lnet_routers.expected $TMP/lnet_routers.out || + error "/proc/sys/lnet/routers does not look as expected" + diff $TMP/lnet_routers.expected $TMP/lnet_routers.sys || + error "lnet.routers does not look as expected" + rm -f $TMP/lnet_routers.expected $TMP/lnet_routers.out $TMP/lnet_routers.sys + + # fisrt line of /proc/sys/lnet/peers should look exactly as expected + cat /proc/sys/lnet/peers >$TMP/lnet_peers.out + sysctl lnet.peers |sed 's/^lnet.peers\ =\ //g' >$TMP/lnet_peers.sys + head -1 $TMP/lnet_peers.out > $TMP/lnet_peers1.out + echo "nid refs state max rtr min tx min queue" >$TMP/lnet_peers1.expected + diff $TMP/lnet_peers1.expected $TMP/lnet_peers1.out || + error "first line of /proc/sys/lnet/peers does not look as expected" + rm -f $TMP/lnet_peers1.expected $TMP/lnet_peers1.out + # other lines should look as a nid followed by 1 number, a word, 6 numbers, e.g.: + # 0@lo 1 NA 0 0 0 0 0 0 + TOTAL_LINES=$(cat $TMP/lnet_peers.out |wc -l) + OTHER_LINES=$(($TOTAL_LINES - 1)) + MATCHED_LINES=$(cat $TMP/lnet_peers.out |tail -$TOTAL_LINES | + grep -c "^[0-9.]\+@[a-z0-9]\+ *[0-9]\+ *[a-Z]\+ *[0-9]\+ *[0-9]\+ *-\?[0-9]\+ *[0-9]\+ *-\?[0-9]\+ *[0-9]\+$") + [ "$MATCHED_LINES" = "$OTHER_LINES" ] || (cat $TMP/lnet_peers.out && + error "/proc/sys/lnet/peers misformatted") + diff $TMP/lnet_peers.out $TMP/lnet_peers.sys || + error "lnet.peers does not look as expected" + rm -f $TMP/lnet_peers.out $TMP/lnet_peers.sys + + # /proc/sys/lnet/buffers should look exactly as expected + cat /proc/sys/lnet/buffers >$TMP/lnet_buffers.out + sysctl lnet.buffers |sed 's/^lnet.buffers\ =\ //g' >$TMP/lnet_buffers.sys + echo "pages count credits min" >$TMP/lnet_buffers.expected + echo " 0 0 0 0" >>$TMP/lnet_buffers.expected + echo " 1 0 0 0" >>$TMP/lnet_buffers.expected + echo " 256 0 0 0" >>$TMP/lnet_buffers.expected + diff $TMP/lnet_buffers.expected $TMP/lnet_buffers.out || + error "/proc/sys/lnet/buffers does not look as expected" + diff $TMP/lnet_buffers.expected $TMP/lnet_buffers.sys || + error "lnet.buffers does not look as expected" + rm -f $TMP/lnet_buffers.expected $TMP/lnet_buffers.out $TMP/lnet_buffers.sys + + # fisrt line of /proc/sys/lnet/nis should look exactly as expected + cat /proc/sys/lnet/nis >$TMP/lnet_nis.out + sysctl lnet.nis |sed 's/^lnet.nis\ =\ //g' >$TMP/lnet_nis.sys + head -1 $TMP/lnet_nis.out > $TMP/lnet_nis1.out + echo "nid refs peer rtr max tx min" >$TMP/lnet_nis1.expected + diff $TMP/lnet_nis1.expected $TMP/lnet_nis1.out || + error "first line of /proc/sys/lnet/nis does not look as expected" + rm -f $TMP/lnet_nis1.expected $TMP/lnet_nis1.out + # other lines should look as a nid followed by 6 numbers, e.g.: + # 0@lo 3 0 0 0 0 0 + TOTAL_LINES=$(cat $TMP/lnet_nis.out |wc -l) + OTHER_LINES=$(($TOTAL_LINES - 1)) + MATCHED_LINES=$(cat $TMP/lnet_nis.out |tail -$TOTAL_LINES | + grep -c "^[0-9.]\+@[a-z0-9]\+ *[0-9]\+ *[0-9]\+ *[0-9]\+ *[0-9]\+ *[0-9]\+ *[0-9]\+$") + [ "$MATCHED_LINES" = "$OTHER_LINES" ] || (cat $TMP/lnet_nis.out && + error "/proc/sys/lnet/nis misformatted") + diff $TMP/lnet_nis.out $TMP/lnet_nis.sys || + error "lnet.nis does not look as expected" + rm -f $TMP/lnet_nis.out $TMP/lnet_nis.sys + + # can we successfully write to /proc/sys/lnet/stats? + echo "0" >/proc/sys/lnet/stats || error "cannot write to /proc/sys/lnet/stats" + sysctl -w lnet.stats=0 || error "cannot write to lnet.stats" +} +run_test 215 "/proc/sys/lnet exists and has proper content - bug 18102" + # # tests that do cleanup/setup should be run at the end #