X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=76d27ce4fbafdb4340cca1d738d21b194d1cb245;hb=13b269ab77daca78fdfc374986d4cc34c7e66309;hp=cfe736d15f7352ece7bb829e046d9736a7c95d1a;hpb=dee5f24114531ec34fc56ce2826ada9e5690aabc;p=fs%2Flustre-release.git diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index cfe736d..76d27ce 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -1,4 +1,5 @@ #!/bin/bash +# -*- tab-width: 4; indent-tabs-mode: t; -*- # # Run select tests by setting ONLY, or as arguments to the script. # Skip specific tests by setting EXCEPT. @@ -154,285 +155,287 @@ test_0c() { run_test 0c "check import proc =============================" test_1a() { - mkdir $DIR/d1 - mkdir $DIR/d1/d2 - mkdir $DIR/d1/d2 && error "we expect EEXIST, but not returned" - $CHECKSTAT -t dir $DIR/d1/d2 || error + test_mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir/d2 + test_mkdir $DIR/$tdir/d2 && error "we expect EEXIST, but not returned" + $CHECKSTAT -t dir $DIR/$tdir/d2 || error } run_test 1a "mkdir .../d1; mkdir .../d1/d2 =====================" test_1b() { - rmdir $DIR/d1/d2 - rmdir $DIR/d1 - $CHECKSTAT -a $DIR/d1 || error + rmdir $DIR/$tdir/d2 + rmdir $DIR/$tdir + $CHECKSTAT -a $DIR/$tdir || error } run_test 1b "rmdir .../d1/d2; rmdir .../d1 =====================" test_2a() { - mkdir $DIR/d2 - touch $DIR/d2/f - $CHECKSTAT -t file $DIR/d2/f || error + test_mkdir $DIR/$tdir + touch $DIR/$tdir/$tfile + $CHECKSTAT -t file $DIR/$tdir/$tfile || error } run_test 2a "mkdir .../d2; touch .../d2/f ======================" test_2b() { - rm -r $DIR/d2 - $CHECKSTAT -a $DIR/d2 || error + rm -r $DIR/$tdir + $CHECKSTAT -a $DIR/$tdir || error } run_test 2b "rm -r .../d2; checkstat .../d2/f ======================" test_3a() { - mkdir $DIR/d3 - $CHECKSTAT -t dir $DIR/d3 || error + test_mkdir -p $DIR/$tdir + $CHECKSTAT -t dir $DIR/$tdir || error } run_test 3a "mkdir .../d3 ======================================" test_3b() { - if [ ! -d $DIR/d3 ]; then - mkdir $DIR/d3 + if [ ! -d $DIR/$tdir ]; then + mkdir $DIR/$tdir fi - touch $DIR/d3/f - $CHECKSTAT -t file $DIR/d3/f || error + touch $DIR/$tdir/$tfile + $CHECKSTAT -t file $DIR/$tdir/$tfile || error } run_test 3b "touch .../d3/f ====================================" test_3c() { - rm -r $DIR/d3 - $CHECKSTAT -a $DIR/d3 || error + rm -r $DIR/$tdir + $CHECKSTAT -a $DIR/$tdir || error } run_test 3c "rm -r .../d3 ======================================" test_4a() { - mkdir $DIR/d4 - $CHECKSTAT -t dir $DIR/d4 || error + test_mkdir -p $DIR/$tdir + $CHECKSTAT -t dir $DIR/$tdir || error } run_test 4a "mkdir .../d4 ======================================" test_4b() { - if [ ! -d $DIR/d4 ]; then - mkdir $DIR/d4 + if [ ! -d $DIR/$tdir ]; then + test_mkdir $DIR/$tdir fi - mkdir $DIR/d4/d2 - $CHECKSTAT -t dir $DIR/d4/d2 || error + test_mkdir $DIR/$tdir/d2 + mkdir $DIR/$tdir/d2 + $CHECKSTAT -t dir $DIR/$tdir/d2 || error } run_test 4b "mkdir .../d4/d2 ===================================" test_5() { - mkdir $DIR/d5 - mkdir $DIR/d5/d2 - chmod 0707 $DIR/d5/d2 - $CHECKSTAT -t dir -p 0707 $DIR/d5/d2 || error + test_mkdir $DIR/$tdir + test_mkdir $DIR/$tdir/d2 + chmod 0707 $DIR/$tdir/d2 + $CHECKSTAT -t dir -p 0707 $DIR/$tdir/d2 || error } run_test 5 "mkdir .../d5 .../d5/d2; chmod .../d5/d2 ============" test_6a() { - touch $DIR/f6a - chmod 0666 $DIR/f6a || error - $CHECKSTAT -t file -p 0666 -u \#$UID $DIR/f6a || error + touch $DIR/$tfile + chmod 0666 $DIR/$tfile || error + $CHECKSTAT -t file -p 0666 -u \#$UID $DIR/$tfile || error } run_test 6a "touch .../f6a; chmod .../f6a ======================" test_6b() { - [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return - if [ ! -f $DIR/f6a ]; then - touch $DIR/f6a - chmod 0666 $DIR/f6a + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return + if [ ! -f $DIR/$tfile ]; then + touch $DIR/$tfile + chmod 0666 $DIR/$tfile fi - $RUNAS chmod 0444 $DIR/f6a && error - $CHECKSTAT -t file -p 0666 -u \#$UID $DIR/f6a || error + $RUNAS chmod 0444 $DIR/$tfile && error + $CHECKSTAT -t file -p 0666 -u \#$UID $DIR/$tfile || error } run_test 6b "$RUNAS chmod .../f6a (should return error) ==" test_6c() { - [ $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 + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return + touch $DIR/$tfile + chown $RUNAS_ID $DIR/$tfile || error + $CHECKSTAT -t file -u \#$RUNAS_ID $DIR/$tfile || error } run_test 6c "touch .../f6c; chown .../f6c ======================" test_6d() { - [ $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 + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return + if [ ! -f $DIR/$tfile ]; then + touch $DIR/$tfile + chown $RUNAS_ID $DIR/$tfile fi - $RUNAS chown $UID $DIR/f6c && error - $CHECKSTAT -t file -u \#$RUNAS_ID $DIR/f6c || error + $RUNAS chown $UID $DIR/$tfile && error + $CHECKSTAT -t file -u \#$RUNAS_ID $DIR/$tfile || error } run_test 6d "$RUNAS chown .../f6c (should return error) ==" test_6e() { - [ $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 + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return + touch $DIR/$tfile + chgrp $RUNAS_ID $DIR/$tfile || error + $CHECKSTAT -t file -u \#$UID -g \#$RUNAS_ID $DIR/$tfile || error } run_test 6e "touch .../f6e; chgrp .../f6e ======================" test_6f() { - [ $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 + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return + if [ ! -f $DIR/$tfile ]; then + touch $DIR/$tfile + chgrp $RUNAS_ID $DIR/$tfile fi - $RUNAS chgrp $UID $DIR/f6e && error - $CHECKSTAT -t file -u \#$UID -g \#$RUNAS_ID $DIR/f6e || error + $RUNAS chgrp $UID $DIR/$tfile && error + $CHECKSTAT -t file -u \#$UID -g \#$RUNAS_ID $DIR/$tfile || error } run_test 6f "$RUNAS chgrp .../f6e (should return error) ==" test_6g() { - [ $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 - chmod g+s $DIR/d6g/d || error - mkdir $DIR/d6g/d/subdir - $CHECKSTAT -g \#$RUNAS_GID $DIR/d6g/d/subdir || error + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return + test_mkdir $DIR/$tdir || error + chmod 777 $DIR/$tdir || error + $RUNAS mkdir $DIR/$tdir/d || error + chmod g+s $DIR/$tdir/d || error + test_mkdir $DIR/$tdir/d/subdir + $CHECKSTAT -g \#$RUNAS_GID $DIR/$tdir/d/subdir || error } run_test 6g "Is new dir in sgid dir inheriting group?" test_6h() { # bug 7331 - [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return - touch $DIR/f6h || error "touch failed" - chown $RUNAS_ID:$RUNAS_GID $DIR/f6h || error "initial chown failed" - $RUNAS -G$RUNAS_GID chown $RUNAS_ID:0 $DIR/f6h && error "chown worked" - $CHECKSTAT -t file -u \#$RUNAS_ID -g \#$RUNAS_GID $DIR/f6h || error + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID" && return + touch $DIR/$tfile || error "touch failed" + chown $RUNAS_ID:$RUNAS_GID $DIR/$tfile || error "initial chown failed" + $RUNAS -G$RUNAS_GID chown $RUNAS_ID:0 $DIR/$tfile && + error "chown worked" + $CHECKSTAT -t file -u \#$RUNAS_ID -g \#$RUNAS_GID $DIR/$tfile || error } run_test 6h "$RUNAS chown RUNAS_ID.0 .../f6h (should return error)" test_7a() { - mkdir $DIR/d7 - $MCREATE $DIR/d7/f - chmod 0666 $DIR/d7/f - $CHECKSTAT -t file -p 0666 $DIR/d7/f || error + test_mkdir $DIR/$tdir + $MCREATE $DIR/$tdir/$tfile + chmod 0666 $DIR/$tdir/$tfile + $CHECKSTAT -t file -p 0666 $DIR/$tdir/$tfile || error } run_test 7a "mkdir .../d7; mcreate .../d7/f; chmod .../d7/f ====" test_7b() { - if [ ! -d $DIR/d7 ]; then - mkdir $DIR/d7 + if [ ! -d $DIR/$tdir ]; then + mkdir $DIR/$tdir fi - $MCREATE $DIR/d7/f2 - echo -n foo > $DIR/d7/f2 - [ "`cat $DIR/d7/f2`" = "foo" ] || error - $CHECKSTAT -t file -s 3 $DIR/d7/f2 || error + $MCREATE $DIR/$tdir/$tfile + echo -n foo > $DIR/$tdir/$tfile + [ "`cat $DIR/$tdir/$tfile`" = "foo" ] || error + $CHECKSTAT -t file -s 3 $DIR/$tdir/$tfile || error } run_test 7b "mkdir .../d7; mcreate d7/f2; echo foo > d7/f2 =====" test_8() { - mkdir $DIR/d8 - touch $DIR/d8/f - chmod 0666 $DIR/d8/f - $CHECKSTAT -t file -p 0666 $DIR/d8/f || error + test_mkdir $DIR/$tdir + touch $DIR/$tdir/$tfile + chmod 0666 $DIR/$tdir/$tfile + $CHECKSTAT -t file -p 0666 $DIR/$tdir/$tfile || error } run_test 8 "mkdir .../d8; touch .../d8/f; chmod .../d8/f =======" test_9() { - mkdir $DIR/d9 - mkdir $DIR/d9/d2 - mkdir $DIR/d9/d2/d3 - $CHECKSTAT -t dir $DIR/d9/d2/d3 || error + test_mkdir $DIR/$tdir + test_mkdir $DIR/$tdir/d2 + test_mkdir $DIR/$tdir/d2/d3 + $CHECKSTAT -t dir $DIR/$tdir/d2/d3 || error } run_test 9 "mkdir .../d9 .../d9/d2 .../d9/d2/d3 ================" test_10() { - mkdir $DIR/d10 - mkdir $DIR/d10/d2 - touch $DIR/d10/d2/f - $CHECKSTAT -t file $DIR/d10/d2/f || error + test_mkdir $DIR/$tdir + test_mkdir $DIR/$tdir/d2 + touch $DIR/$tdir/d2/$tfile + $CHECKSTAT -t file $DIR/$tdir/d2/$tfile || error } run_test 10 "mkdir .../d10 .../d10/d2; touch .../d10/d2/f ======" test_11() { - mkdir $DIR/d11 - mkdir $DIR/d11/d2 - chmod 0666 $DIR/d11/d2 - chmod 0705 $DIR/d11/d2 - $CHECKSTAT -t dir -p 0705 $DIR/d11/d2 || error + test_mkdir $DIR/$tdir + test_mkdir $DIR/$tdir/d2 + chmod 0666 $DIR/$tdir/d2 + chmod 0705 $DIR/$tdir/d2 + $CHECKSTAT -t dir -p 0705 $DIR/$tdir/d2 || error } run_test 11 "mkdir .../d11 d11/d2; chmod .../d11/d2 ============" test_12() { - mkdir $DIR/d12 - touch $DIR/d12/f - chmod 0666 $DIR/d12/f - chmod 0654 $DIR/d12/f - $CHECKSTAT -t file -p 0654 $DIR/d12/f || error + test_mkdir $DIR/$tdir + touch $DIR/$tdir/$tfile + chmod 0666 $DIR/$tdir/$tfile + chmod 0654 $DIR/$tdir/$tfile + $CHECKSTAT -t file -p 0654 $DIR/$tdir/$tfile || error } run_test 12 "touch .../d12/f; chmod .../d12/f .../d12/f ========" test_13() { - mkdir $DIR/d13 - dd if=/dev/zero of=$DIR/d13/f count=10 - > $DIR/d13/f - $CHECKSTAT -t file -s 0 $DIR/d13/f || error + test_mkdir $DIR/$tdir + dd if=/dev/zero of=$DIR/$tdir/$tfile count=10 + > $DIR/$tdir/$tfile + $CHECKSTAT -t file -s 0 $DIR/$tdir/$tfile || error } run_test 13 "creat .../d13/f; dd .../d13/f; > .../d13/f ========" test_14() { - mkdir $DIR/d14 - touch $DIR/d14/f - rm $DIR/d14/f - $CHECKSTAT -a $DIR/d14/f || error + test_mkdir $DIR/$tdir + touch $DIR/$tdir/$tfile + rm $DIR/$tdir/$tfile + $CHECKSTAT -a $DIR/$tdir/$tfile || error } run_test 14 "touch .../d14/f; rm .../d14/f; rm .../d14/f =======" test_15() { - mkdir $DIR/d15 - touch $DIR/d15/f - mv $DIR/d15/f $DIR/d15/f2 - $CHECKSTAT -t file $DIR/d15/f2 || error + test_mkdir $DIR/$tdir + touch $DIR/$tdir/$tfile + mv $DIR/$tdir/$tfile $DIR/$tdir/${tfile}_2 + $CHECKSTAT -t file $DIR/$tdir/${tfile}_2 || error } run_test 15 "touch .../d15/f; mv .../d15/f .../d15/f2 ==========" test_16() { - mkdir $DIR/d16 - touch $DIR/d16/f - rm -rf $DIR/d16/f - $CHECKSTAT -a $DIR/d16/f || error + test_mkdir $DIR/$tdir + touch $DIR/$tdir/$tfile + rm -rf $DIR/$tdir/$tfile + $CHECKSTAT -a $DIR/$tdir/$tfile || error } run_test 16 "touch .../d16/f; rm -rf .../d16/f =================" test_17a() { - mkdir -p $DIR/d17 - touch $DIR/d17/f - ln -s $DIR/d17/f $DIR/d17/l-exist - ls -l $DIR/d17 - $CHECKSTAT -l $DIR/d17/f $DIR/d17/l-exist || error - $CHECKSTAT -f -t f $DIR/d17/l-exist || error - rm -f $DIR/d17/l-exist - $CHECKSTAT -a $DIR/d17/l-exist || error + test_mkdir -p $DIR/$tdir + touch $DIR/$tdir/$tfile + ln -s $DIR/$tdir/$tfile $DIR/$tdir/l-exist + ls -l $DIR/$tdir + $CHECKSTAT -l $DIR/$tdir/$tfile $DIR/$tdir/l-exist || error + $CHECKSTAT -f -t f $DIR/$tdir/l-exist || error + rm -f $DIR/$tdir/l-exist + $CHECKSTAT -a $DIR/$tdir/l-exist || error } run_test 17a "symlinks: create, remove (real) ==================" test_17b() { - mkdir -p $DIR/d17 - ln -s no-such-file $DIR/d17/l-dangle - ls -l $DIR/d17 - $CHECKSTAT -l no-such-file $DIR/d17/l-dangle || error - $CHECKSTAT -fa $DIR/d17/l-dangle || error - rm -f $DIR/d17/l-dangle - $CHECKSTAT -a $DIR/d17/l-dangle || error + test_mkdir -p $DIR/$tdir + ln -s no-such-file $DIR/$tdir/l-dangle + ls -l $DIR/$tdir + $CHECKSTAT -l no-such-file $DIR/$tdir/l-dangle || error + $CHECKSTAT -fa $DIR/$tdir/l-dangle || error + rm -f $DIR/$tdir/l-dangle + $CHECKSTAT -a $DIR/$tdir/l-dangle || error } run_test 17b "symlinks: create, remove (dangling) ==============" test_17c() { # bug 3440 - don't save failed open RPC for replay - mkdir -p $DIR/d17 - ln -s foo $DIR/d17/f17c - cat $DIR/d17/f17c && error "opened non-existent symlink" || true + test_mkdir -p $DIR/$tdir + ln -s foo $DIR/$tdir/$tfile + cat $DIR/$tdir/$tfile && error "opened non-existent symlink" || true } run_test 17c "symlinks: open dangling (should return error) ====" test_17d() { - mkdir -p $DIR/d17 - ln -s foo $DIR/d17/f17d - touch $DIR/d17/f17d || error "creating to new symlink" + test_mkdir -p $DIR/$tdir + ln -s foo $DIR/$tdir/$tfile + touch $DIR/$tdir/$tfile || error "creating to new symlink" } run_test 17d "symlinks: create dangling ========================" test_17e() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir local foo=$DIR/$tdir/$tfile ln -s $foo $foo || error "create symlink failed" ls -l $foo || error "ls -l failed" @@ -441,7 +444,7 @@ test_17e() { run_test 17e "symlinks: create recursive symlink (should return error) ====" test_17f() { - mkdir -p $DIR/d17f + test_mkdir -p $DIR/d17f ln -s 1234567890/2234567890/3234567890/4234567890 $DIR/d17f/111 ln -s 1234567890/2234567890/3234567890/4234567890/5234567890/6234567890 $DIR/d17f/222 ln -s 1234567890/2234567890/3234567890/4234567890/5234567890/6234567890/7234567890/8234567890 $DIR/d17f/333 @@ -452,31 +455,59 @@ test_17f() { } run_test 17f "symlinks: long and very long symlink name ========================" +# str_repeat(S, N) generate a string that is string S repeated N times +str_repeat() { + local s=$1 + local n=$2 + local ret='' + while [ $((n -= 1)) -ge 0 ]; do + ret=$ret$s + done + echo $ret +} + +# Long symlinks and LU-2241 test_17g() { - mkdir -p $DIR/$tdir - LONGSYMLINK="$(dd if=/dev/zero bs=4095 count=1 | tr '\0' 'x')" - ln -s $LONGSYMLINK $DIR/$tdir/$tfile - ls -l $DIR/$tdir + test_mkdir -p $DIR/$tdir + local TESTS="59 60 61 4094 4095" + + for i in $TESTS; do + local SYMNAME=$(str_repeat 'x' $i) + ln -s $SYMNAME $DIR/$tdir/f$i || error "failed $i-char symlink" + readlink $DIR/$tdir/f$i || error "failed $i-char readlink" + done } -run_test 17g "symlinks: really long symlink name ===============================" +run_test 17g "symlinks: really long symlink name and inode boundaries" test_17h() { #bug 17378 - remote_mds_nodsh && skip "remote MDS with nodsh" && return - mkdir -p $DIR/$tdir + remote_mds_nodsh && skip "remote MDS with nodsh" && return + local mdt_idx + test_mkdir -p $DIR/$tdir + if [ $MDSCOUNT -gt 1 ]; then + mdt_idx=$($LFS getdirstripe -i $DIR/$tdir) + else + mdt_idx=0 + fi $SETSTRIPE -c -1 $DIR/$tdir #define OBD_FAIL_MDS_LOV_PREP_CREATE 0x141 - do_facet $SINGLEMDS lctl set_param fail_loc=0x80000141 + do_facet mds$((mdt_idx + 1)) lctl set_param fail_loc=0x80000141 touch $DIR/$tdir/$tfile || true } run_test 17h "create objects: lov_free_memmd() doesn't lbug" test_17i() { #bug 20018 - remote_mds_nodsh && skip "remote MDS with nodsh" && return - mkdir -p $DIR/$tdir + remote_mds_nodsh && skip "remote MDS with nodsh" && return + test_mkdir -p $DIR/$tdir local foo=$DIR/$tdir/$tfile + local mdt_idx + if [ $MDSCOUNT -gt 1 ]; then + mdt_idx=$($LFS getdirstripe -i $DIR/$tdir) + else + mdt_idx=0 + fi ln -s $foo $foo || error "create symlink failed" #define OBD_FAIL_MDS_READLINK_EPROTO 0x143 - do_facet $SINGLEMDS lctl set_param fail_loc=0x80000143 + do_facet mds$((mdt_idx + 1)) lctl set_param fail_loc=0x80000143 ls -l $foo && error "error not detected" return 0 } @@ -485,7 +516,8 @@ run_test 17i "don't panic on short symlink" test_17k() { #bug 22301 rsync --help | grep -q xattr || skip_env "$(rsync --version| head -1) does not support xattrs" - mkdir -p $DIR/{$tdir,$tdir.new} + test_mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir.new touch $DIR/$tdir/$tfile ln -s $DIR/$tdir/$tfile $DIR/$tdir/$tfile.lnk rsync -av -X $DIR/$tdir/ $DIR/$tdir.new || @@ -493,6 +525,22 @@ test_17k() { #bug 22301 } run_test 17k "symlinks: rsync with xattrs enabled =========================" +test_17l() { # LU-279 + mkdir -p $DIR/$tdir + touch $DIR/$tdir/$tfile + ln -s $DIR/$tdir/$tfile $DIR/$tdir/$tfile.lnk + for path in "$DIR/$tdir" "$DIR/$tdir/$tfile" "$DIR/$tdir/$tfile.lnk"; do + # -h to not follow symlinks. -m '' to list all the xattrs. + # grep to remove first line: '# file: $path'. + for xattr in `getfattr -hm '' $path 2>/dev/null | grep -v '^#'`; + do + lgetxattr_size_check $path $xattr || + error "lgetxattr_size_check $path $xattr failed" + done + done +} +run_test 17l "Ensure lgetxattr's returned xattr size is consistent ========" + # LU-1540 test_17m() { local short_sym="0123456789" @@ -526,7 +574,7 @@ test_17m() { echo "erase them" rm -f $WDIR/* sync - sleep 2 + wait_delete_completed echo "recreate the 512 symlink files with a shorter string" for ((i = 0; i < 512; ++i)); do @@ -553,6 +601,59 @@ test_17m() { } run_test 17m "run e2fsck against MDT which contains short/long symlink" +check_fs_consistency_17n() { + local mdt_index + local devname + local cmd + local rc=0 + + for mdt_index in $(seq 1 $MDSCOUNT); do + devname=$(mdsdevname $mdt_index) + cmd="$E2FSCK -fnvd $devname" + + echo "stop and checking mds${mdt_index}: $cmd" + # e2fsck should not return error + stop mds${mdt_index} + do_facet mds${mdt_index} $cmd || rc=$? + + start mds${mdt_index} $devname $MDS_MOUNT_OPTS + df $MOUNT > /dev/null 2>&1 + [ $rc -ne 0 ] && break + done + return $rc +} + +test_17n() { + local i + + [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] && + [ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.2.93) ] && + skip "MDS 2.2.0-2.2.93 do not NUL-terminate symlinks" && return + + [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && + skip "only for ldiskfs MDT" && return 0 + + [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + + mkdir -p $DIR/$tdir + for ((i=0; i<10; i++)); do + $LFS mkdir -i 1 $DIR/$tdir/remote_dir_${i} || + error "create remote dir error $i" + createmany -o $DIR/$tdir/remote_dir_${i}/f 10 || + error "create files under remote dir failed $i" + done + + check_fs_consistency_17n || error "e2fsck report error" + + for ((i=0;i<10;i++)); do + rm -rf $DIR/$tdir/remote_dir_${i} || + error "destroy remote dir error $i" + done + + check_fs_consistency_17n || error "e2fsck report error" +} +run_test 17n "run e2fsck against master/slave MDT which contains remote dir" + test_18() { touch $DIR/f ls $DIR || error @@ -598,7 +699,7 @@ test_20() { run_test 20 "touch .../f ; ls -l ... ===========================" test_21() { - mkdir $DIR/d21 + test_mkdir $DIR/d21 [ -f $DIR/d21/dangle ] && rm -f $DIR/d21/dangle ln -s dangle $DIR/d21/link echo foo >> $DIR/d21/link @@ -610,7 +711,7 @@ run_test 21 "write to dangling link ============================" test_22() { WDIR=$DIR/$tdir - mkdir -p $WDIR + test_mkdir -p $DIR/$tdir chown $RUNAS_ID:$RUNAS_GID $WDIR (cd $WDIR || error "cd $WDIR failed"; $RUNAS tar cf - /etc/hosts /etc/sysconfig/network | \ @@ -623,7 +724,7 @@ run_test 22 "unpack tar archive as non-root user ===============" # was test_23 test_23a() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir local file=$DIR/$tdir/$tfile openfile -f O_CREAT:O_EXCL $file || error "$file create failed" @@ -633,7 +734,7 @@ test_23a() { run_test 23a "O_CREAT|O_EXCL in subdir ==========================" test_23b() { # bug 18988 - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir local file=$DIR/$tdir/$tfile rm -f $file @@ -647,7 +748,7 @@ run_test 23b "O_APPEND check ==========================" test_24a() { echo '== rename sanity ==============================================' echo '-- same directory rename' - mkdir $DIR/R1 + test_mkdir $DIR/R1 touch $DIR/R1/f mv $DIR/R1/f $DIR/R1/g $CHECKSTAT -t file $DIR/R1/g || error @@ -655,7 +756,7 @@ test_24a() { run_test 24a "touch .../R1/f; rename .../R1/f .../R1/g =========" test_24b() { - mkdir $DIR/R2 + test_mkdir $DIR/R2 touch $DIR/R2/{f,g} mv $DIR/R2/f $DIR/R2/g $CHECKSTAT -a $DIR/R2/f || error @@ -664,8 +765,8 @@ test_24b() { run_test 24b "touch .../R2/{f,g}; rename .../R2/f .../R2/g =====" test_24c() { - mkdir $DIR/R3 - mkdir $DIR/R3/f + test_mkdir $DIR/R3 + test_mkdir $DIR/R3/f mv $DIR/R3/f $DIR/R3/g $CHECKSTAT -a $DIR/R3/f || error $CHECKSTAT -t dir $DIR/R3/g || error @@ -673,8 +774,9 @@ test_24c() { run_test 24c "mkdir .../R3/f; rename .../R3/f .../R3/g =========" test_24d() { - mkdir $DIR/R4 - mkdir $DIR/R4/{f,g} + test_mkdir $DIR/R4 + test_mkdir $DIR/R4/f + test_mkdir $DIR/R4/g mrename $DIR/R4/f $DIR/R4/g $CHECKSTAT -a $DIR/R4/f || error $CHECKSTAT -t dir $DIR/R4/g || error @@ -683,7 +785,8 @@ run_test 24d "mkdir .../R4/{f,g}; rename .../R4/f .../R4/g =====" test_24e() { echo '-- cross directory renames --' - mkdir $DIR/R5{a,b} + test_mkdir $DIR/R5a + test_mkdir $DIR/R5b touch $DIR/R5a/f mv $DIR/R5a/f $DIR/R5b/g $CHECKSTAT -a $DIR/R5a/f || error @@ -692,7 +795,8 @@ test_24e() { run_test 24e "touch .../R5a/f; rename .../R5a/f .../R5b/g ======" test_24f() { - mkdir $DIR/R6{a,b} + test_mkdir $DIR/R6a + test_mkdir $DIR/R6b touch $DIR/R6a/f $DIR/R6b/g mv $DIR/R6a/f $DIR/R6b/g $CHECKSTAT -a $DIR/R6a/f || error @@ -701,8 +805,9 @@ test_24f() { run_test 24f "touch .../R6a/f R6b/g; mv .../R6a/f .../R6b/g ====" test_24g() { - mkdir $DIR/R7{a,b} - mkdir $DIR/R7a/d + test_mkdir $DIR/R7a + test_mkdir $DIR/R7b + test_mkdir $DIR/R7a/d mv $DIR/R7a/d $DIR/R7b/e $CHECKSTAT -a $DIR/R7a/d || error $CHECKSTAT -t dir $DIR/R7b/e || error @@ -710,8 +815,10 @@ test_24g() { run_test 24g "mkdir .../R7{a,b}/d; mv .../R7a/d .../R7b/e ======" test_24h() { - mkdir $DIR/R8{a,b} - mkdir $DIR/R8a/d $DIR/R8b/e + test_mkdir $DIR/R8a + test_mkdir $DIR/R8b + test_mkdir $DIR/R8a/d + test_mkdir $DIR/R8b/e mrename $DIR/R8a/d $DIR/R8b/e $CHECKSTAT -a $DIR/R8a/d || error $CHECKSTAT -t dir $DIR/R8b/e || error @@ -720,8 +827,8 @@ run_test 24h "mkdir .../R8{a,b}/{d,e}; rename .../R8a/d .../R8b/e" test_24i() { echo "-- rename error cases" - mkdir $DIR/R9 - mkdir $DIR/R9/a + test_mkdir $DIR/R9 + test_mkdir $DIR/R9/a touch $DIR/R9/f mrename $DIR/R9/f $DIR/R9/a $CHECKSTAT -t file $DIR/R9/f || error @@ -731,7 +838,7 @@ test_24i() { run_test 24i "rename file to dir error: touch f ; mkdir a ; rename f a" test_24j() { - mkdir $DIR/R10 + test_mkdir $DIR/R10 mrename $DIR/R10/f $DIR/R10/g $CHECKSTAT -t dir $DIR/R10 || error $CHECKSTAT -a $DIR/R10/f || error @@ -740,7 +847,8 @@ test_24j() { run_test 24j "source does not exist ============================" test_24k() { - mkdir $DIR/R11a $DIR/R11a/d + test_mkdir $DIR/R11a + test_mkdir $DIR/R11a/d touch $DIR/R11a/f mv $DIR/R11a/f $DIR/R11a/d $CHECKSTAT -a $DIR/R11a/f || error @@ -778,13 +886,14 @@ run_test 24n "Statting the old file after renaming (Posix rename 2)" test_24o() { check_kernel_version 37 || return 0 - mkdir -p $DIR/d24o + test_mkdir -p $DIR/d24o rename_many -s random -v -n 10 $DIR/d24o } run_test 24o "rename of files during htree split ===============" test_24p() { - mkdir $DIR/R12{a,b} + test_mkdir $DIR/R12a + test_mkdir $DIR/R12b DIRINO=`ls -lid $DIR/R12a | awk '{ print $1 }'` mrename $DIR/R12a $DIR/R12b $CHECKSTAT -a $DIR/R12a || error @@ -795,7 +904,8 @@ test_24p() { run_test 24p "mkdir .../R12{a,b}; rename .../R12a .../R12b" test_24q() { - mkdir $DIR/R13{a,b} + test_mkdir $DIR/R13a + test_mkdir $DIR/R13b DIRINO=`ls -lid $DIR/R13a | awk '{ print $1 }'` multiop_bg_pause $DIR/R13b D_c || return 1 MULTIPID=$! @@ -811,7 +921,8 @@ test_24q() { run_test 24q "mkdir .../R13{a,b}; open R13b rename R13a R13b ===" test_24r() { #bug 3789 - mkdir $DIR/R14a $DIR/R14a/b + test_mkdir $DIR/R14a + test_mkdir $DIR/R14a/b mrename $DIR/R14a $DIR/R14a/b && error "rename to subdir worked!" $CHECKSTAT -t dir $DIR/R14a || error "$DIR/R14a missing" $CHECKSTAT -t dir $DIR/R14a/b || error "$DIR/R14a/b missing" @@ -819,14 +930,18 @@ test_24r() { #bug 3789 run_test 24r "mkdir .../R14a/b; rename .../R14a .../R14a/b =====" test_24s() { - mkdir $DIR/R15a $DIR/R15a/b $DIR/R15a/b/c + test_mkdir $DIR/R15a + test_mkdir $DIR/R15a/b + test_mkdir $DIR/R15a/b/c mrename $DIR/R15a $DIR/R15a/b/c && error "rename to sub-subdir worked!" $CHECKSTAT -t dir $DIR/R15a || error "$DIR/R15a missing" $CHECKSTAT -t dir $DIR/R15a/b/c || error "$DIR/R15a/b/c missing" } run_test 24s "mkdir .../R15a/b/c; rename .../R15a .../R15a/b/c =" test_24t() { - mkdir $DIR/R16a $DIR/R16a/b $DIR/R16a/b/c + test_mkdir $DIR/R16a + test_mkdir $DIR/R16a/b + test_mkdir $DIR/R16a/b/c mrename $DIR/R16a/b/c $DIR/R16a && error "rename to sub-subdir worked!" $CHECKSTAT -t dir $DIR/R16a || error "$DIR/R16a missing" $CHECKSTAT -t dir $DIR/R16a/b/c || error "$DIR/R16a/b/c missing" @@ -834,8 +949,9 @@ test_24t() { run_test 24t "mkdir .../R16a/b/c; rename .../R16a/b/c .../R16a =" test_24u() { # bug12192 - $MULTIOP $DIR/$tfile C2w$((2048 * 1024))c || error - $CHECKSTAT -s $((2048 * 1024)) $DIR/$tfile || error "wrong file size" + rm -rf $DIR/$tfile + $MULTIOP $DIR/$tfile C2w$((2048 * 1024))c || error + $CHECKSTAT -s $((2048 * 1024)) $DIR/$tfile || error "wrong file size" } run_test 24u "create stripe file" @@ -843,20 +959,32 @@ page_size() { getconf PAGE_SIZE } +simple_cleanup_common() { + trap 0 + rm -rf $DIR/$tdir + wait_delete_completed +} + +max_pages_per_rpc() { + $LCTL get_param -n mdc.*.max_pages_per_rpc | head -1 +} + test_24v() { local NRFILES=100000 - local FREE_INODES=`lfs df -i|grep "filesystem summary" | awk '{print $5}'` + local FREE_INODES=$(lfs_df -i | grep "summary" | awk '{print $4}') [ $FREE_INODES -lt $NRFILES ] && \ - skip "not enough free inodes $FREE_INODES required $NRFILES" && \ + skip "not enough free inodes $FREE_INODES required $NRFILES" && return - mkdir -p $DIR/d24v - createmany -m $DIR/d24v/$tfile $NRFILES + trap simple_cleanup_common EXIT + + mkdir -p $DIR/$tdir + createmany -m $DIR/$tdir/$tfile $NRFILES cancel_lru_locks mdc lctl set_param mdc.*.stats clear - ls $DIR/d24v >/dev/null || error "error in listing large dir" + ls $DIR/$tdir >/dev/null || error "error in listing large dir" # LU-5 large readdir # DIRENT_SIZE = 32 bytes for sizeof(struct lu_dirent) + @@ -865,14 +993,14 @@ test_24v() { # take into account of overhead in lu_dirpage header and end mark in # each page, plus one in RPC_NUM calculation. DIRENT_SIZE=48 - RPC_SIZE=$(($(lctl get_param -n mdc.*.max_pages_per_rpc)*$(page_size))) + RPC_SIZE=$(($(max_pages_per_rpc) * $(page_size))) RPC_NUM=$(((NRFILES * DIRENT_SIZE + RPC_SIZE - 1) / RPC_SIZE + 1)) - mds_readpage=`lctl get_param mdc.*.stats | \ - awk '/^mds_readpage/ {print $2}'` + mds_readpage=$(lctl get_param mdc.*MDT0000*.stats | \ + awk '/^mds_readpage/ {print $2}') [ $mds_readpage -gt $RPC_NUM ] && \ error "large readdir doesn't take effect" - rm $DIR/d24v -rf + simple_cleanup_common } run_test 24v "list directory with large files (handle hash collision, bug: 17560)" @@ -887,10 +1015,84 @@ test_24w() { # bug21506 } run_test 24w "Reading a file larger than 4Gb" +test_24x() { + [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + local MDTIDX=1 + local remote_dir=$DIR/$tdir/remote_dir + + mkdir -p $DIR/$tdir + $LFS mkdir -i $MDTIDX $remote_dir || + error "create remote directory failed" + + mkdir -p $DIR/$tdir/src_dir + touch $DIR/$tdir/src_file + mkdir -p $remote_dir/tgt_dir + touch $remote_dir/tgt_file + + mrename $DIR/$tdir/src_dir $remote_dir/tgt_dir && + error "rename dir cross MDT works!" + + mrename $DIR/$tdir/src_file $remote_dir/tgt_file && + error "rename file cross MDT works!" + + ln $DIR/$tdir/src_file $remote_dir/tgt_file1 && + error "ln file cross MDT should not work!" + + rm -rf $DIR/$tdir || error "Can not delete directories" +} +run_test 24x "cross rename/link should be failed" + +test_24y() { + [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + local MDTIDX=1 + local remote_dir=$DIR/$tdir/remote_dir + + mkdir -p $DIR/$tdir + $LFS mkdir -i $MDTIDX $remote_dir || + error "create remote directory failed" + + mkdir -p $remote_dir/src_dir + touch $remote_dir/src_file + mkdir -p $remote_dir/tgt_dir + touch $remote_dir/tgt_file + + mrename $remote_dir/src_dir $remote_dir/tgt_dir || + error "rename subdir in the same remote dir failed!" + + mrename $remote_dir/src_file $remote_dir/tgt_file || + error "rename files in the same remote dir failed!" + + ln $remote_dir/tgt_file $remote_dir/tgt_file1 || + error "link files in the same remote dir failed!" + + rm -rf $DIR/$tdir || error "Can not delete directories" +} +run_test 24y "rename/link on the same dir should succeed" + +test_24z() { + [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + local MDTIDX=1 + local remote_src=$DIR/$tdir/remote_dir + local remote_tgt=$DIR/$tdir/remote_tgt + + mkdir -p $DIR/$tdir + $LFS mkdir -i $MDTIDX $remote_src || + error "create remote directory failed" + + $LFS mkdir -i $MDTIDX $remote_tgt || + error "create remote directory failed" + + mrename $remote_src $remote_tgt && + error "rename remote dirs should not work!" + + rm -rf $DIR/$tdir || error "Can not delete directories" +} +run_test 24z "rename one remote dir to another remote dir should fail" + test_25a() { echo '== symlink sanity =============================================' - mkdir $DIR/d25 + test_mkdir $DIR/d25 ln -s d25 $DIR/s25 touch $DIR/s25/foo || error } @@ -903,22 +1105,22 @@ test_25b() { run_test 25b "lookup file in symlinked directory ===============" test_26a() { - mkdir $DIR/d26 - mkdir $DIR/d26/d26-2 + test_mkdir $DIR/d26 + test_mkdir $DIR/d26/d26-2 ln -s d26/d26-2 $DIR/s26 touch $DIR/s26/foo || error } run_test 26a "multiple component symlink =======================" test_26b() { - mkdir -p $DIR/d26b/d26-2 + test_mkdir -p $DIR/d26b/d26-2 ln -s d26b/d26-2/foo $DIR/s26-2 touch $DIR/s26-2 || error } run_test 26b "multiple component symlink at end of lookup ======" test_26c() { - mkdir $DIR/d26.2 + test_mkdir $DIR/d26.2 touch $DIR/d26.2/foo ln -s d26.2 $DIR/s26.2-1 ln -s s26.2-1 $DIR/s26.2-2 @@ -941,11 +1143,11 @@ run_test 26e "unlink multiple component recursive symlink ======" # recursive symlinks (bug 7022) test_26f() { - mkdir -p $DIR/$tdir - mkdir $DIR/$tdir/$tfile || error "mkdir $DIR/$tdir/$tfile failed" + test_mkdir -p $DIR/$tdir + test_mkdir $DIR/$tdir/$tfile || error "mkdir $DIR/$tdir/$tfile failed" cd $DIR/$tdir/$tfile || error "cd $DIR/$tdir/$tfile failed" - mkdir -p lndir/bar1 || error "mkdir lndir/bar1 failed" - mkdir $tfile || error "mkdir $tfile failed" + test_mkdir -p lndir bar1 || error "mkdir lndir/bar1 failed" + test_mkdir $DIR/$tdir/$tfile/$tfile || error "mkdir $tfile failed" cd $tfile || error "cd $tfile failed" ln -s .. dotdot || error "ln dotdot failed" ln -s dotdot/lndir lndir || error "ln lndir failed" @@ -959,7 +1161,7 @@ run_test 26f "rm -r of a directory which has recursive symlink =" test_27a() { echo '== stripe sanity ==============================================' - mkdir -p $DIR/d27 || error "mkdir failed" + test_mkdir -p $DIR/d27 || error "mkdir failed" $GETSTRIPE $DIR/d27 $SETSTRIPE -c 1 $DIR/d27/f0 || error "setstripe failed" $CHECKSTAT -t file $DIR/d27/f0 || error "checkstat failed" @@ -971,7 +1173,7 @@ run_test 27a "one stripe file ==================================" test_27b() { [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return - mkdir -p $DIR/d27 + test_mkdir -p $DIR/d27 $SETSTRIPE -c 2 $DIR/d27/f01 || error "setstripe failed" $GETSTRIPE -c $DIR/d27/f01 [ $($GETSTRIPE -c $DIR/d27/f01) -eq 2 ] || @@ -987,7 +1189,7 @@ test_27c() { run_test 27c "write to two stripe file" test_27d() { - mkdir -p $DIR/d27 + test_mkdir -p $DIR/d27 $SETSTRIPE -c 0 -i -1 -S 0 $DIR/d27/fdef || error "setstripe failed" $CHECKSTAT -t file $DIR/d27/fdef || error "checkstat failed" dd if=/dev/zero of=$DIR/d27/fdef bs=4k count=4 || error @@ -995,7 +1197,7 @@ test_27d() { run_test 27d "create file with default settings ================" test_27e() { - mkdir -p $DIR/d27 + test_mkdir -p $DIR/d27 $SETSTRIPE -c 2 $DIR/d27/f12 || error "setstripe failed" $SETSTRIPE -c 2 $DIR/d27/f12 && error "setstripe succeeded twice" $CHECKSTAT -t file $DIR/d27/f12 || error "checkstat failed" @@ -1003,7 +1205,7 @@ test_27e() { run_test 27e "setstripe existing file (should return error) ======" test_27f() { - mkdir -p $DIR/d27 + test_mkdir -p $DIR/d27 $SETSTRIPE -S 100 -i 0 -c 1 $DIR/d27/fbad && error "setstripe failed" dd if=/dev/zero of=$DIR/d27/f12 bs=4k count=4 || error "dd failed" $GETSTRIPE $DIR/d27/fbad || error "$GETSTRIPE failed" @@ -1011,7 +1213,7 @@ test_27f() { run_test 27f "setstripe with bad stripe size (should return error)" test_27g() { - mkdir -p $DIR/d27 + test_mkdir -p $DIR/d27 $MCREATE $DIR/d27/fnone || error "mcreate failed" $GETSTRIPE $DIR/d27/fnone 2>&1 | grep "no stripe info" || error "$DIR/d27/fnone has object" @@ -1025,16 +1227,16 @@ test_27i() { run_test 27i "$GETSTRIPE with some objects" test_27j() { - mkdir -p $DIR/d27 + test_mkdir -p $DIR/d27 $SETSTRIPE -i $OSTCOUNT $DIR/d27/f27j && error "setstripe failed"||true } run_test 27j "setstripe with bad stripe offset (should return error)" test_27k() { # bug 2844 - mkdir -p $DIR/d27 + test_mkdir -p $DIR/d27 FILE=$DIR/d27/f27k LL_MAX_BLKSIZE=$((4 * 1024 * 1024)) - [ ! -d $DIR/d27 ] && mkdir -p $DIR/d27 + [ ! -d $DIR/d27 ] && test_mkdir -p $DIR d27 $SETSTRIPE -S 67108864 $FILE || error "setstripe failed" BLKSIZE=`stat $FILE | awk '/IO Block:/ { print $7 }'` [ $BLKSIZE -le $LL_MAX_BLKSIZE ] || error "$BLKSIZE > $LL_MAX_BLKSIZE" @@ -1045,7 +1247,7 @@ test_27k() { # bug 2844 run_test 27k "limit i_blksize for broken user apps =============" test_27l() { - mkdir -p $DIR/d27 + test_mkdir -p $DIR/d27 mcreate $DIR/f27l || error "creating file" $RUNAS $SETSTRIPE -c 1 $DIR/f27l && \ error "setstripe should have failed" || true @@ -1053,30 +1255,31 @@ test_27l() { run_test 27l "check setstripe permissions (should return error)" test_27m() { - [ "$OSTCOUNT" -lt "2" ] && skip_env "$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 fi - mkdir -p $DIR/d27 - $SETSTRIPE -i 0 -c 1 $DIR/d27/f27m_1 - dd if=/dev/zero of=$DIR/d27/f27m_1 bs=1024 count=$MAXFREE && + trap simple_cleanup_common EXIT + test_mkdir -p $DIR/$tdir + $SETSTRIPE -i 0 -c 1 $DIR/$tdir/f27m_1 + dd if=/dev/zero of=$DIR/$tdir/f27m_1 bs=1024 count=$MAXFREE && error "dd should fill OST0" i=2 - while $SETSTRIPE -i 0 -c 1 $DIR/d27/f27m_$i; do + while $SETSTRIPE -i 0 -c 1 $DIR/$tdir/f27m_$i; do i=`expr $i + 1` [ $i -gt 256 ] && break done i=`expr $i + 1` - touch $DIR/d27/f27m_$i - [ `$GETSTRIPE $DIR/d27/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] && \ + touch $DIR/$tdir/f27m_$i + [ `$GETSTRIPE $DIR/$tdir/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] && error "OST0 was full but new created file still use it" i=`expr $i + 1` - touch $DIR/d27/f27m_$i - [ `$GETSTRIPE $DIR/d27/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] && \ + touch $DIR/$tdir/f27m_$i + [ `$GETSTRIPE $DIR/$tdir/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] && error "OST0 was full but new created file still use it" - rm -r $DIR/d27 - sleep 15 + simple_cleanup_common } run_test 27m "create file while OST0 was full ==================" @@ -1103,7 +1306,7 @@ exhaust_precreations() { local FAILLOC=$2 local FAILIDX=${3:-$OSTIDX} - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir local MDSIDX=$(get_mds_dir "$DIR/$tdir") echo OSTIDX=$OSTIDX MDSIDX=$MDSIDX @@ -1121,7 +1324,7 @@ exhaust_precreations() { local mdtosc_proc2=$(get_mdtosc_proc_path mds${MDSIDX}) do_facet mds${MDSIDX} lctl get_param osc.$mdtosc_proc2.prealloc* - mkdir -p $DIR/$tdir/${OST} + test_mkdir -p $DIR/$tdir/${OST} $SETSTRIPE -i $OSTIDX -c 1 $DIR/$tdir/${OST} #define OBD_FAIL_OST_ENOSPC 0x215 do_facet ost$((OSTIDX + 1)) lctl set_param fail_val=$FAILIDX @@ -1178,7 +1381,7 @@ test_27p() { reset_enospc rm -f $DIR/$tdir/$tfile - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $MCREATE $DIR/$tdir/$tfile || error "mcreate failed" $TRUNCATE $DIR/$tdir/$tfile 80000000 || error "truncate failed" @@ -1201,7 +1404,7 @@ test_27q() { reset_enospc rm -f $DIR/$tdir/$tfile - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $MCREATE $DIR/$tdir/$tfile || error "mcreate $DIR/$tdir/$tfile failed" $TRUNCATE $DIR/$tdir/$tfile 80000000 ||error "truncate $DIR/$tdir/$tfile failed" $CHECKSTAT -s 80000000 $DIR/$tdir/$tfile || error "checkstat failed" @@ -1231,7 +1434,7 @@ test_27r() { run_test 27r "stripe file with some full OSTs (shouldn't LBUG) =" test_27s() { # bug 10725 - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir local stripe_size=$((4096 * 1024 * 1024)) # 2^32 local stripe_count=0 [ $OSTCOUNT -eq 1 ] || stripe_count=2 @@ -1257,7 +1460,7 @@ test_27u() { # bug 4900 #define OBD_FAIL_MDS_OSC_PRECREATE 0x139 do_facet $SINGLEMDS lctl set_param fail_loc=0x139 - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir createmany -o $DIR/$tdir/t- 1000 do_facet $SINGLEMDS lctl set_param fail_loc=0 @@ -1278,7 +1481,7 @@ test_27v() { # bug 4900 exhaust_all_precreations 0x215 reset_enospc - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE -c 1 $DIR/$tdir # 1 stripe / file touch $DIR/$tdir/$tfile @@ -1301,7 +1504,7 @@ test_27v() { # bug 4900 run_test 27v "skip object creation on slow OST =================" test_27w() { # bug 10997 - mkdir -p $DIR/$tdir || error "mkdir failed" + test_mkdir -p $DIR/$tdir || error "mkdir failed" $SETSTRIPE -S 65536 $DIR/$tdir/f0 || error "setstripe failed" [ $($GETSTRIPE -S $DIR/$tdir/f0) -ne 65536 ] && error "stripe size $size != 65536" || true @@ -1314,7 +1517,7 @@ test_27wa() { [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping multiple stripe count/offset test" && return - mkdir -p $DIR/$tdir || error "mkdir failed" + test_mkdir -p $DIR/$tdir || error "mkdir failed" for i in $(seq 1 $OSTCOUNT); do offset=$((i - 1)) $SETSTRIPE -c $i -i $offset $DIR/$tdir/f$i || @@ -1335,7 +1538,7 @@ test_27x() { OSTIDX=0 local OST=$(ostname_from_index $OSTIDX) - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE -c 1 $DIR/$tdir # 1 stripe per file do_facet ost$((OSTIDX + 1)) lctl set_param -n obdfilter.$OST.degraded 1 sleep_maxage @@ -1362,37 +1565,53 @@ test_27y() { [ $fcount -eq 0 ] && skip "not enough space on OST0" && return [ $fcount -gt $OSTCOUNT ] && fcount=$OSTCOUNT - MDS_OSCS=`do_facet $SINGLEMDS lctl dl | awk '/[oO][sS][cC].*md[ts]/ { print $4 }'` - OFFSET=$(($OSTCOUNT-1)) - OST=-1 - for OSC in $MDS_OSCS; do - if [ $OST == -1 ]; then { - OST=`osc_to_ost $OSC` - } else { - echo $OSC "is Deactivate:" - do_facet $SINGLEMDS lctl --device %$OSC deactivate - } fi - done - - OSTIDX=$(index_from_ostuuid $OST) - mkdir -p $DIR/$tdir - $SETSTRIPE -c 1 $DIR/$tdir # 1 stripe / file + local MDS_OSCS=$(do_facet $SINGLEMDS lctl dl | + awk '/[oO][sS][cC].*md[ts]/ { print $4 }') + local OST_DEACTIVE_IDX=-1 + local OSC + local OSTIDX + local OST + + for OSC in $MDS_OSCS; do + OST=$(osc_to_ost $OSC) + OSTIDX=$(index_from_ostuuid $OST) + if [ $OST_DEACTIVE_IDX == -1 ]; then + OST_DEACTIVE_IDX=$OSTIDX + fi + if [ $OSTIDX != $OST_DEACTIVE_IDX ]; then + echo $OSC "is Deactivated:" + do_facet $SINGLEMDS lctl --device %$OSC deactivate + fi + done - do_facet ost$((OSTIDX+1)) lctl set_param -n obdfilter.$OST.degraded 1 - sleep_maxage - createmany -o $DIR/$tdir/$tfile $fcount - do_facet ost$((OSTIDX+1)) lctl set_param -n obdfilter.$OST.degraded 0 + OSTIDX=$(index_from_ostuuid $OST) + mkdir -p $DIR/$tdir + $SETSTRIPE -c 1 $DIR/$tdir # 1 stripe / file + + for OSC in $MDS_OSCS; do + OST=$(osc_to_ost $OSC) + OSTIDX=$(index_from_ostuuid $OST) + if [ $OSTIDX == $OST_DEACTIVE_IDX ]; then + echo $OST "is degraded:" + do_facet ost$((OSTIDX+1)) lctl set_param -n \ + obdfilter.$OST.degraded=1 + fi + done - for i in `seq 0 $OFFSET`; do - [ `$GETSTRIPE $DIR/$tdir/$tfile$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "$OSTIDX"` ] || \ - error "files created on deactivated OSTs instead of degraded OST" - done - for OSC in $MDS_OSCS; do - [ `osc_to_ost $OSC` != $OST ] && { - echo $OSC "is activate" - do_facet $SINGLEMDS lctl --device %$OSC activate - } - done + sleep_maxage + createmany -o $DIR/$tdir/$tfile $fcount + + for OSC in $MDS_OSCS; do + OST=$(osc_to_ost $OSC) + OSTIDX=$(index_from_ostuuid $OST) + if [ $OSTIDX == $OST_DEACTIVE_IDX ]; then + echo $OST "is recovered from degraded:" + do_facet ost$((OSTIDX+1)) lctl set_param -n \ + obdfilter.$OST.degraded=0 + else + do_facet $SINGLEMDS lctl --device %$OSC activate + fi + done } run_test 27y "create files while OST0 is degraded and the rest inactive" @@ -1477,7 +1696,7 @@ check_seq_oid() test_27z() { remote_ost_nodsh && skip "remote OST with nodsh" && return - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE -c 1 -i 0 -S 64k $DIR/$tdir/$tfile-1 || { error "setstripe -c -1 failed"; return 1; } @@ -1519,14 +1738,14 @@ run_test 27A "check filesystem-wide default LOV EA values" # createtest also checks that device nodes are created and # then visible correctly (#2091) test_28() { # bug 2091 - mkdir $DIR/d28 + test_mkdir $DIR/d28 $CREATETEST $DIR/d28/ct || error } run_test 28 "create/mknod/mkdir with bad file types ============" test_29() { cancel_lru_locks mdc - mkdir $DIR/d29 + test_mkdir $DIR/d29 touch $DIR/d29/foo log 'first d29' ls -l $DIR/d29 @@ -1636,7 +1855,7 @@ run_test 31e "remove of open non-empty directory ===============" test_31f() { # bug 4554 set -vx - mkdir $DIR/d31f + test_mkdir $DIR/d31f $SETSTRIPE -S 1048576 -c 1 $DIR/d31f cp /etc/hosts $DIR/d31f ls -l $DIR/d31f @@ -1645,7 +1864,7 @@ test_31f() { # bug 4554 MULTIPID=$! rm -rv $DIR/d31f || error "first of $DIR/d31f" - mkdir $DIR/d31f + test_mkdir $DIR/d31f $SETSTRIPE -S 1048576 -c 1 $DIR/d31f cp /etc/hosts $DIR/d31f ls -l $DIR/d31f @@ -1666,7 +1885,8 @@ run_test 31f "remove of open directory with open-unlink file ===" test_31g() { echo "-- cross directory link --" - mkdir $DIR/d31g{a,b} + test_mkdir $DIR/d31ga + test_mkdir $DIR/d31gb touch $DIR/d31ga/f ln $DIR/d31ga/f $DIR/d31gb/g $CHECKSTAT -t file $DIR/d31ga/f || error "source" @@ -1678,8 +1898,8 @@ run_test 31g "cross directory link===============" test_31h() { echo "-- cross directory link --" - mkdir $DIR/d31h - mkdir $DIR/d31h/dir + test_mkdir $DIR/d31h + test_mkdir $DIR/d31h/dir touch $DIR/d31h/f ln $DIR/d31h/f $DIR/d31h/dir/g $CHECKSTAT -t file $DIR/d31h/f || error "source" @@ -1691,8 +1911,8 @@ run_test 31h "cross directory link under child===============" test_31i() { echo "-- cross directory link --" - mkdir $DIR/d31i - mkdir $DIR/d31i/dir + test_mkdir $DIR/d31i + test_mkdir $DIR/d31i/dir touch $DIR/d31i/dir/f ln $DIR/d31i/dir/f $DIR/d31i/g $CHECKSTAT -t file $DIR/d31i/dir/f || error "source" @@ -1704,8 +1924,8 @@ run_test 31i "cross directory link under parent===============" test_31j() { - mkdir $DIR/d31j - mkdir $DIR/d31j/dir1 + test_mkdir $DIR/d31j + test_mkdir $DIR/d31j/dir1 ln $DIR/d31j/dir1 $DIR/d31j/dir2 && error "ln for dir" link $DIR/d31j/dir1 $DIR/d31j/dir3 && error "link for dir" mlink $DIR/d31j/dir1 $DIR/d31j/dir4 && error "mlink for dir" @@ -1716,7 +1936,7 @@ run_test 31j "link for directory===============" test_31k() { - mkdir $DIR/d31k + test_mkdir $DIR/d31k touch $DIR/d31k/s touch $DIR/d31k/exist mlink $DIR/d31k/s $DIR/d31k/t || error "mlink" @@ -1731,9 +1951,9 @@ test_31k() { run_test 31k "link to file: the same, non-existing, dir===============" test_31m() { - mkdir $DIR/d31m + test_mkdir $DIR/d31m touch $DIR/d31m/s - mkdir $DIR/d31m2 + test_mkdir $DIR/d31m2 touch $DIR/d31m2/exist mlink $DIR/d31m/s $DIR/d31m2/t || error "mlink" mlink $DIR/d31m/s $DIR/d31m2/exist && error "mlink to exist file" @@ -1745,48 +1965,57 @@ test_31m() { } run_test 31m "link to file: the same, non-existing, dir===============" +cleanup_test32_mount() { + trap 0 + $UMOUNT $DIR/$tdir/ext2-mountpoint +} + test_32a() { echo "== more mountpoints and symlinks =================" - [ -e $DIR/d32a ] && rm -fr $DIR/d32a - mkdir -p $DIR/d32a/ext2-mountpoint - mount -t ext2 -o loop $EXT2_DEV $DIR/d32a/ext2-mountpoint || error - $CHECKSTAT -t dir $DIR/d32a/ext2-mountpoint/.. || error - $UMOUNT $DIR/d32a/ext2-mountpoint || error + [ -e $DIR/$tdir ] && rm -fr $DIR/$tdir + trap cleanup_test32_mount EXIT + test_mkdir -p $DIR/$tdir/ext2-mountpoint + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error + $CHECKSTAT -t dir $DIR/$tdir/ext2-mountpoint/.. || error + cleanup_test32_mount } run_test 32a "stat d32a/ext2-mountpoint/.. =====================" test_32b() { - [ -e $DIR/d32b ] && rm -fr $DIR/d32b - mkdir -p $DIR/d32b/ext2-mountpoint - mount -t ext2 -o loop $EXT2_DEV $DIR/d32b/ext2-mountpoint || error - ls -al $DIR/d32b/ext2-mountpoint/.. || error - $UMOUNT $DIR/d32b/ext2-mountpoint || error + [ -e $DIR/$tdir ] && rm -fr $DIR/$tdir + trap cleanup_test32_mount EXIT + test_mkdir -p $DIR/$tdir/ext2-mountpoint + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error + ls -al $DIR/$tdir/ext2-mountpoint/.. || error + cleanup_test32_mount } run_test 32b "open d32b/ext2-mountpoint/.. =====================" test_32c() { - [ -e $DIR/d32c ] && rm -fr $DIR/d32c - mkdir -p $DIR/d32c/ext2-mountpoint - mount -t ext2 -o loop $EXT2_DEV $DIR/d32c/ext2-mountpoint || error - mkdir -p $DIR/d32c/d2/test_dir - $CHECKSTAT -t dir $DIR/d32c/ext2-mountpoint/../d2/test_dir || error - $UMOUNT $DIR/d32c/ext2-mountpoint || error + [ -e $DIR/$tdir ] && rm -fr $DIR/$tdir + trap cleanup_test32_mount EXIT + test_mkdir -p $DIR/$tdir/ext2-mountpoint + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error + test_mkdir -p $DIR/$tdir/d2/test_dir + $CHECKSTAT -t dir $DIR/$tdir/ext2-mountpoint/../d2/test_dir || error + cleanup_test32_mount } run_test 32c "stat d32c/ext2-mountpoint/../d2/test_dir =========" test_32d() { - [ -e $DIR/d32d ] && rm -fr $DIR/d32d - mkdir -p $DIR/d32d/ext2-mountpoint - mount -t ext2 -o loop $EXT2_DEV $DIR/d32d/ext2-mountpoint || error - mkdir -p $DIR/d32d/d2/test_dir - ls -al $DIR/d32d/ext2-mountpoint/../d2/test_dir || error - $UMOUNT $DIR/d32d/ext2-mountpoint || error + [ -e $DIR/$tdir ] && rm -fr $DIR/$tdir + trap cleanup_test32_mount EXIT + test_mkdir -p $DIR/$tdir/ext2-mountpoint + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error + test_mkdir -p $DIR/$tdir/d2/test_dir + ls -al $DIR/$tdir/ext2-mountpoint/../d2/test_dir || error + cleanup_test32_mount } run_test 32d "open d32d/ext2-mountpoint/../d2/test_dir =========" test_32e() { [ -e $DIR/d32e ] && rm -fr $DIR/d32e - mkdir -p $DIR/d32e/tmp + test_mkdir -p $DIR/d32e/tmp TMP_DIR=$DIR/d32e/tmp ln -s $DIR/d32e $TMP_DIR/symlink11 ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01 @@ -1797,7 +2026,7 @@ run_test 32e "stat d32e/symlink->tmp/symlink->lustre-subdir ====" test_32f() { [ -e $DIR/d32f ] && rm -fr $DIR/d32f - mkdir -p $DIR/d32f/tmp + test_mkdir -p $DIR/d32f/tmp TMP_DIR=$DIR/d32f/tmp ln -s $DIR/d32f $TMP_DIR/symlink11 ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01 @@ -1808,7 +2037,8 @@ run_test 32f "open d32f/symlink->tmp/symlink->lustre-subdir ====" test_32g() { TMP_DIR=$DIR/$tdir/tmp - mkdir -p $TMP_DIR $DIR/${tdir}2 + test_mkdir -p $DIR/$tdir/tmp + test_mkdir $DIR/${tdir}2 ln -s $DIR/${tdir}2 $TMP_DIR/symlink12 ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02 $CHECKSTAT -t link $TMP_DIR/symlink12 || error @@ -1821,7 +2051,8 @@ run_test 32g "stat d32g/symlink->tmp/symlink->lustre-subdir/${tdir}2" test_32h() { rm -fr $DIR/$tdir $DIR/${tdir}2 TMP_DIR=$DIR/$tdir/tmp - mkdir -p $TMP_DIR $DIR/${tdir}2 + test_mkdir -p $DIR/$tdir/tmp + test_mkdir $DIR/${tdir}2 ln -s $DIR/${tdir}2 $TMP_DIR/symlink12 ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02 ls $TMP_DIR/symlink12 || error @@ -1830,50 +2061,54 @@ test_32h() { run_test 32h "open d32h/symlink->tmp/symlink->lustre-subdir/${tdir}2" test_32i() { - [ -e $DIR/d32i ] && rm -fr $DIR/d32i - mkdir -p $DIR/d32i/ext2-mountpoint - mount -t ext2 -o loop $EXT2_DEV $DIR/d32i/ext2-mountpoint || error - touch $DIR/d32i/test_file - $CHECKSTAT -t file $DIR/d32i/ext2-mountpoint/../test_file || error - $UMOUNT $DIR/d32i/ext2-mountpoint || error + [ -e $DIR/$tdir ] && rm -fr $DIR/$tdir + trap cleanup_test32_mount EXIT + test_mkdir -p $DIR/$tdir/ext2-mountpoint + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error + touch $DIR/$tdir/test_file + $CHECKSTAT -t file $DIR/$tdir/ext2-mountpoint/../test_file || error + cleanup_test32_mount } run_test 32i "stat d32i/ext2-mountpoint/../test_file ===========" test_32j() { - [ -e $DIR/d32j ] && rm -fr $DIR/d32j - mkdir -p $DIR/d32j/ext2-mountpoint - mount -t ext2 -o loop $EXT2_DEV $DIR/d32j/ext2-mountpoint || error - touch $DIR/d32j/test_file - cat $DIR/d32j/ext2-mountpoint/../test_file || error - $UMOUNT $DIR/d32j/ext2-mountpoint || error + [ -e $DIR/$tdir ] && rm -fr $DIR/$tdir + trap cleanup_test32_mount EXIT + test_mkdir -p $DIR/$tdir/ext2-mountpoint + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error + touch $DIR/$tdir/test_file + cat $DIR/$tdir/ext2-mountpoint/../test_file || error + cleanup_test32_mount } run_test 32j "open d32j/ext2-mountpoint/../test_file ===========" test_32k() { - rm -fr $DIR/d32k - mkdir -p $DIR/d32k/ext2-mountpoint - mount -t ext2 -o loop $EXT2_DEV $DIR/d32k/ext2-mountpoint - mkdir -p $DIR/d32k/d2 - touch $DIR/d32k/d2/test_file || error - $CHECKSTAT -t file $DIR/d32k/ext2-mountpoint/../d2/test_file || error - $UMOUNT $DIR/d32k/ext2-mountpoint || error + rm -fr $DIR/$tdir + trap cleanup_test32_mount EXIT + test_mkdir -p $DIR/$tdir/ext2-mountpoint + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint + test_mkdir -p $DIR/$tdir/d2 + touch $DIR/$tdir/d2/test_file || error + $CHECKSTAT -t file $DIR/$tdir/ext2-mountpoint/../d2/test_file || error + cleanup_test32_mount } run_test 32k "stat d32k/ext2-mountpoint/../d2/test_file ========" test_32l() { - rm -fr $DIR/d32l - mkdir -p $DIR/d32l/ext2-mountpoint - mount -t ext2 -o loop $EXT2_DEV $DIR/d32l/ext2-mountpoint || error - mkdir -p $DIR/d32l/d2 - touch $DIR/d32l/d2/test_file - cat $DIR/d32l/ext2-mountpoint/../d2/test_file || error - $UMOUNT $DIR/d32l/ext2-mountpoint || error + rm -fr $DIR/$tdir + trap cleanup_test32_mount EXIT + test_mkdir -p $DIR/$tdir/ext2-mountpoint + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error + test_mkdir -p $DIR/$tdir/d2 + touch $DIR/$tdir/d2/test_file + cat $DIR/$tdir/ext2-mountpoint/../d2/test_file || error + cleanup_test32_mount } run_test 32l "open d32l/ext2-mountpoint/../d2/test_file ========" test_32m() { rm -fr $DIR/d32m - mkdir -p $DIR/d32m/tmp + test_mkdir -p $DIR/d32m/tmp TMP_DIR=$DIR/d32m/tmp ln -s $DIR $TMP_DIR/symlink11 ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01 @@ -1884,7 +2119,7 @@ run_test 32m "stat d32m/symlink->tmp/symlink->lustre-root ======" test_32n() { rm -fr $DIR/d32n - mkdir -p $DIR/d32n/tmp + test_mkdir -p $DIR/d32n/tmp TMP_DIR=$DIR/d32n/tmp ln -s $DIR $TMP_DIR/symlink11 ln -s $TMP_DIR/symlink11 $TMP_DIR/../symlink01 @@ -1896,7 +2131,7 @@ run_test 32n "open d32n/symlink->tmp/symlink->lustre-root ======" test_32o() { rm -fr $DIR/d32o $DIR/$tfile touch $DIR/$tfile - mkdir -p $DIR/d32o/tmp + test_mkdir -p $DIR/d32o/tmp TMP_DIR=$DIR/d32o/tmp ln -s $DIR/$tfile $TMP_DIR/symlink12 ln -s $TMP_DIR/symlink12 $TMP_DIR/../symlink02 @@ -1915,7 +2150,7 @@ test_32p() { log 32p_3 touch $DIR/$tfile log 32p_4 - mkdir -p $DIR/d32p/tmp + test_mkdir -p $DIR/d32p/tmp log 32p_5 TMP_DIR=$DIR/d32p/tmp log 32p_6 @@ -1930,27 +2165,34 @@ test_32p() { } run_test 32p "open d32p/symlink->tmp/symlink->lustre-root/$tfile" +cleanup_testdir_mount() { + trap 0 + $UMOUNT $DIR/$tdir +} + test_32q() { - [ -e $DIR/d32q ] && rm -fr $DIR/d32q - mkdir -p $DIR/d32q - touch $DIR/d32q/under_the_mount - mount -t ext2 -o loop $EXT2_DEV $DIR/d32q - ls $DIR/d32q/under_the_mount && error || true - $UMOUNT $DIR/d32q || error + [ -e $DIR/$tdir ] && rm -fr $DIR/$tdir + trap cleanup_testdir_mount EXIT + test_mkdir -p $DIR/$tdir + touch $DIR/$tdir/under_the_mount + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir + ls $DIR/$tdir | grep "\" && error + cleanup_testdir_mount } run_test 32q "stat follows mountpoints in Lustre (should return error)" test_32r() { - [ -e $DIR/d32r ] && rm -fr $DIR/d32r - mkdir -p $DIR/d32r - touch $DIR/d32r/under_the_mount - mount -t ext2 -o loop $EXT2_DEV $DIR/d32r - ls $DIR/d32r | grep -q under_the_mount && error || true - $UMOUNT $DIR/d32r || error + [ -e $DIR/$tdir ] && rm -fr $DIR/$tdir + trap cleanup_testdir_mount EXIT + test_mkdir -p $DIR/$tdir + touch $DIR/$tdir/under_the_mount + mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir + ls $DIR/$tdir | grep -q under_the_mount && error || true + cleanup_testdir_mount } run_test 32r "opendir follows mountpoints in Lustre (should return error)" -test_33() { +test_33aa() { rm -f $DIR/$tfile touch $DIR/$tfile chmod 444 $DIR/$tfile @@ -1959,11 +2201,11 @@ test_33() { $RUNAS $OPENFILE -f O_RDWR $DIR/$tfile && error || true log 33_2 } -run_test 33 "write file with mode 444 (should return error) ====" +run_test 33aa "write file with mode 444 (should return error) ====" test_33a() { rm -fr $DIR/d33 - mkdir -p $DIR/d33 + test_mkdir -p $DIR/d33 chown $RUNAS_ID $DIR/d33 $RUNAS $OPENFILE -f O_RDWR:O_CREAT -m 0444 $DIR/d33/f33|| error "create" $RUNAS $OPENFILE -f O_RDWR:O_CREAT -m 0444 $DIR/d33/f33 && \ @@ -1973,7 +2215,7 @@ run_test 33a "test open file(mode=0444) with O_RDWR (should return error)" test_33b() { rm -fr $DIR/d33 - mkdir -p $DIR/d33 + test_mkdir -p $DIR/d33 chown $RUNAS_ID $DIR/d33 $RUNAS $OPENFILE -f 1286739555 $DIR/d33/f33 && error "create" || true } @@ -1988,7 +2230,7 @@ test_33c() { remote_ost_nodsh && skip "remote OST with nodsh" && return all_zeros=: rm -fr $DIR/d33 - mkdir -p $DIR/d33 + test_mkdir -p $DIR/d33 # Read: 0, Write: 4, create/destroy: 2/0, stat: 1, punch: 0 sync @@ -2044,6 +2286,31 @@ test_33c() { } run_test 33c "test llobdstat and write_bytes" +test_33d() { + [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + local MDTIDX=1 + local remote_dir=$DIR/$tdir/remote_dir + + mkdir -p $DIR/$tdir + $LFS mkdir -i $MDTIDX $remote_dir || + error "create remote directory failed" + + touch $remote_dir/$tfile + chmod 444 $remote_dir/$tfile + chown $RUNAS_ID $remote_dir/$tfile + + $RUNAS $OPENFILE -f O_RDWR $DIR/$tfile && error || true + + chown $RUNAS_ID $remote_dir + $RUNAS $OPENFILE -f O_RDWR:O_CREAT -m 0444 $remote_dir/f33 || + error "create" || true + $RUNAS $OPENFILE -f O_RDWR:O_CREAT -m 0444 $remote_dir/f33 && + error "open RDWR" || true + $RUNAS $OPENFILE -f 1286739555 $remote_dir/f33 && + error "create" || true +} +run_test 33d "openfile with 444 modes and malformed flags under remote dir" + TEST_34_SIZE=${TEST_34_SIZE:-2000000000000} test_34a() { rm -f $DIR/f34 @@ -2164,7 +2431,7 @@ run_test 36b "OST utime check (open, utime) ====================" test_36c() { rm -f $DIR/d36/f36 - mkdir $DIR/d36 + test_mkdir $DIR/d36 chown $RUNAS_ID $DIR/d36 $RUNAS utime $DIR/d36/f36 || error } @@ -2179,7 +2446,7 @@ run_test 36d "non-root OST utime check (open, utime) ===========" test_36e() { [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir touch $DIR/$tdir/$tfile $RUNAS utime $DIR/$tdir/$tfile && \ error "utime worked, expected failure" || true @@ -2193,7 +2460,7 @@ subr_36fh() { export LANG=C LC_LANG=C # for date language DATESTR="Dec 20 2000" - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir lctl set_param fail_loc=$fl date; date +%s cp /etc/hosts $DIR/$tdir/$tfile @@ -2225,7 +2492,7 @@ test_36g() { local fmd_before local fmd_after - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir fmd_max_age=$(do_facet ost1 \ "lctl get_param -n obdfilter.*.client_cache_seconds 2> /dev/null | \ head -n 1") @@ -2251,15 +2518,7 @@ test_36h() { } run_test 36h "utime on file racing with OST BRW write ==========" -test_37() { - mkdir -p $DIR/$tdir - echo f > $DIR/$tdir/fbugfile - mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir - ls $DIR/$tdir | grep "\" && error - $UMOUNT $DIR/$tdir || error - rm -f $DIR/$tdir/fbugfile || error -} -run_test 37 "ls a mounted file system to check old content =====" +# test_37 - duplicate with tests 32q 32r test_38() { local file=$DIR/$tfile @@ -2293,7 +2552,7 @@ test_39() { run_test 39 "mtime changed on create ===========================" test_39b() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir cp -p /etc/passwd $DIR/$tdir/fopen cp -p /etc/passwd $DIR/$tdir/flink cp -p /etc/passwd $DIR/$tdir/funlink @@ -2546,33 +2805,18 @@ run_test 39k "write, utime, close, stat ========================" # this should be set to future TEST_39_ATIME=`date -d "1 year" +%s` -is_sles11() # LU-1783 -{ - if [ -r /etc/SuSE-release ] - then - local vers=`grep VERSION /etc/SuSE-release | awk '{print $3}'` - local patchlev=`grep PATCHLEVEL /etc/SuSE-release \ - | awk '{print $3}'` - if [ $vers -eq 11 ] && [ $patchlev -eq 1 ] - then - return 0 - fi - fi - return 1 -} - test_39l() { - is_sles11 && skip "SLES 11 SP1" && return # LU-1783 remote_mds_nodsh && skip "remote MDS with nodsh" && return - local atime_diff=$(do_facet $SINGLEMDS lctl get_param -n mdd.*.atime_diff) - + local atime_diff=$(do_facet $SINGLEMDS \ + lctl get_param -n mdd.*MDT0000*.atime_diff) + rm -rf $DIR/$tdir mkdir -p $DIR/$tdir # test setting directory atime to future touch -a -d @$TEST_39_ATIME $DIR/$tdir local atime=$(stat -c %X $DIR/$tdir) [ "$atime" = $TEST_39_ATIME ] || \ - error "atime is not set to future: $atime, should be $TEST_39_ATIME" + error "atime is not set to future: $atime, $TEST_39_ATIME" # test setting directory atime from future to now local d1=$(date +%s) @@ -2582,9 +2826,9 @@ test_39l() { cancel_lru_locks mdc atime=$(stat -c %X $DIR/$tdir) [ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] || \ - error "atime is not updated from future: $atime, should be $d1 dir atime + atime_diff @@ -2596,7 +2840,7 @@ test_39l() { [ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] || \ error "atime is not updated : $atime, should be $d2" - do_facet $SINGLEMDS lctl set_param -n mdd.*.atime_diff=60 + do_facet $SINGLEMDS lctl set_param -n mdd.*MDT0000*.atime_diff=60 sleep 3 # test not setting directory atime when now < dir atime + atime_diff @@ -2606,7 +2850,8 @@ test_39l() { [ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] || \ error "atime is updated to $atime, should remain $d1 /dev/null || error "'ls .' failed after recreating cwd" ls .. > /dev/null || error "'ls ..' failed after removing cwd" cd . || error "'cd .' failed after recreating cwd" - mkdir . && error "'mkdir .' worked after recreating cwd" + test_mkdir . && error "'mkdir .' worked after recreating cwd" rmdir . && error "'rmdir .' worked after recreating cwd" ln -s . baz || error "'ln -s .' failed after recreating cwd" cd .. || error "'cd ..' failed after recreating cwd" @@ -3030,19 +3281,22 @@ run_test 48a "Access renamed working dir (should return errors)=" test_48b() { # bug 2399 check_kernel_version 34 || return 0 - mkdir -p $DIR/d48b - cd $DIR/d48b - rmdir $DIR/d48b || error "remove cwd $DIR/d48b failed" + rm -rf $DIR/$tdir + test_mkdir -p $DIR/$tdir + cd $DIR/$tdir + rmdir $DIR/$tdir || error "remove cwd $DIR/$tdir failed" touch foo && error "'touch foo' worked after removing cwd" - mkdir foo && error "'mkdir foo' worked after removing cwd" + test_mkdir $DIR/$tdir/foo && + error "'mkdir foo' worked after removing cwd" if check_kernel_version 44; then touch .foo && error "'touch .foo' worked after removing cwd" - mkdir .foo && error "'mkdir .foo' worked after removing cwd" + test_mkdir $DIR/$tdir/.foo && + error "'mkdir .foo' worked after removing cwd" fi ls . > /dev/null && error "'ls .' worked after removing cwd" ls .. > /dev/null || error "'ls ..' failed after removing cwd" is_patchless || ( cd . && error "'cd .' worked after removing cwd" ) - mkdir . && error "'mkdir .' worked after removing cwd" + test_mkdir $DIR/$tdir/. && error "'mkdir .' worked after removing cwd" rmdir . && error "'rmdir .' worked after removing cwd" ln -s . foo && error "'ln -s .' worked after removing cwd" cd .. || echo "'cd ..' failed after removing cwd `pwd`" #bug 3517 @@ -3053,19 +3307,21 @@ test_48c() { # bug 2350 check_kernel_version 36 || return 0 #lctl set_param debug=-1 #set -vx - mkdir -p $DIR/d48c/dir - cd $DIR/d48c/dir - $TRACE rmdir $DIR/d48c/dir || error "remove cwd $DIR/d48c/dir failed" - $TRACE touch foo && error "'touch foo' worked after removing cwd" - $TRACE mkdir foo && error "'mkdir foo' worked after removing cwd" + rm -rf $DIR/$tdir + test_mkdir -p $DIR/$tdir/dir + cd $DIR/$tdir/dir + $TRACE rmdir $DIR/$tdir/dir || error "remove cwd $DIR/$tdir/dir failed" + $TRACE touch foo && error "touch foo worked after removing cwd" + $TRACE test_mkdir foo && error "'mkdir foo' worked after removing cwd" if check_kernel_version 44; then - touch .foo && error "'touch .foo' worked after removing cwd" - mkdir .foo && error "'mkdir .foo' worked after removing cwd" + touch .foo && error "touch .foo worked after removing cwd" + test_mkdir .foo && error "mkdir .foo worked after removing cwd" fi $TRACE ls . && error "'ls .' worked after removing cwd" $TRACE ls .. || error "'ls ..' failed after removing cwd" - is_patchless || ( $TRACE cd . && error "'cd .' worked after removing cwd" ) - $TRACE mkdir . && error "'mkdir .' worked after removing cwd" + is_patchless || ( $TRACE cd . && + error "'cd .' worked after removing cwd" ) + $TRACE test_mkdir . && error "'mkdir .' worked after removing cwd" $TRACE rmdir . && error "'rmdir .' worked after removing cwd" $TRACE ln -s . foo && error "'ln -s .' worked after removing cwd" $TRACE cd .. || echo "'cd ..' failed after removing cwd `pwd`" #bug 3415 @@ -3076,23 +3332,27 @@ test_48d() { # bug 2350 check_kernel_version 36 || return 0 #lctl set_param debug=-1 #set -vx - mkdir -p $DIR/d48d/dir - cd $DIR/d48d/dir - $TRACE rmdir $DIR/d48d/dir || error "remove cwd $DIR/d48d/dir failed" - $TRACE rmdir $DIR/d48d || error "remove parent $DIR/d48d failed" + rm -rf $DIR/$tdir + test_mkdir -p $DIR/$tdir/dir + cd $DIR/$tdir/dir + $TRACE rmdir $DIR/$tdir/dir || error "remove cwd $DIR/$tdir/dir failed" + $TRACE rmdir $DIR/$tdir || error "remove parent $DIR/$tdir failed" $TRACE touch foo && error "'touch foo' worked after removing parent" - $TRACE mkdir foo && error "'mkdir foo' worked after removing parent" + $TRACE test_mkdir foo && error "mkdir foo worked after removing parent" if check_kernel_version 44; then touch .foo && error "'touch .foo' worked after removing parent" - mkdir .foo && error "'mkdir .foo' worked after removing parent" + test_mkdir .foo && + error "mkdir .foo worked after removing parent" fi $TRACE ls . && error "'ls .' worked after removing parent" $TRACE ls .. && error "'ls ..' worked after removing parent" - is_patchless || ( $TRACE cd . && error "'cd .' worked after recreate parent" ) - $TRACE mkdir . && error "'mkdir .' worked after removing parent" + is_patchless || ( $TRACE cd . && + error "'cd .' worked after recreate parent" ) + $TRACE test_mkdir . && error "'mkdir .' worked after removing parent" $TRACE rmdir . && error "'rmdir .' worked after removing parent" $TRACE ln -s . foo && error "'ln -s .' worked after removing parent" - is_patchless || ( $TRACE cd .. && error "'cd ..' worked after removing parent" || true ) + is_patchless || ( $TRACE cd .. && + error "'cd ..' worked after removing parent" || true ) } run_test 48d "Access removed parent subdir (should return errors)" @@ -3100,17 +3360,18 @@ test_48e() { # bug 4134 check_kernel_version 41 || return 0 #lctl set_param debug=-1 #set -vx - mkdir -p $DIR/d48e/dir - cd $DIR/d48e/dir - $TRACE rmdir $DIR/d48e/dir || error "remove cwd $DIR/d48e/dir failed" - $TRACE rmdir $DIR/d48e || error "remove parent $DIR/d48e failed" - $TRACE touch $DIR/d48e || error "'touch $DIR/d48e' failed" - $TRACE chmod +x $DIR/d48e || error "'chmod +x $DIR/d48e' failed" + rm -rf $DIR/$tdir + test_mkdir -p $DIR/$tdir/dir + cd $DIR/$tdir/dir + $TRACE rmdir $DIR/$tdir/dir || error "remove cwd $DIR/$tdir/dir failed" + $TRACE rmdir $DIR/$tdir || error "remove parent $DIR/$tdir failed" + $TRACE touch $DIR/$tdir || error "'touch $DIR/$tdir' failed" + $TRACE chmod +x $DIR/$tdir || error "'chmod +x $DIR/$tdir' failed" # On a buggy kernel addition of "touch foo" after cd .. will # produce kernel oops in lookup_hash_it touch ../foo && error "'cd ..' worked after recreate parent" cd $DIR - $TRACE rm $DIR/d48e || error "rm '$DIR/d48e' failed" + $TRACE rm $DIR/$tdir || error "rm '$DIR/$tdir' failed" } run_test 48e "Access to recreated parent subdir (should return errors)" @@ -3140,34 +3401,35 @@ run_test 49 "Change max_pages_per_rpc won't break osc extent" test_50() { # bug 1485 - mkdir $DIR/d50 - cd $DIR/d50 + test_mkdir $DIR/$tdir + cd $DIR/$tdir ls /proc/$$/cwd || error } run_test 50 "special situations: /proc symlinks ===============" test_51a() { # was test_51 # bug 1516 - create an empty entry right after ".." then split dir - mkdir $DIR/d51 - touch $DIR/d51/foo - $MCREATE $DIR/d51/bar - rm $DIR/d51/foo - createmany -m $DIR/d51/longfile 201 + test_mkdir $DIR/$tdir + touch $DIR/$tdir/foo + $MCREATE $DIR/$tdir/bar + rm $DIR/$tdir/foo + createmany -m $DIR/$tdir/longfile 201 FNUM=202 - while [ `ls -sd $DIR/d51 | awk '{ print $1 }'` -eq 4 ]; do - $MCREATE $DIR/d51/longfile$FNUM + while [ `ls -sd $DIR/$tdir | awk '{ print $1 }'` -eq 4 ]; do + $MCREATE $DIR/$tdir/longfile$FNUM FNUM=$(($FNUM + 1)) echo -n "+" done echo - ls -l $DIR/d51 > /dev/null || error + ls -l $DIR/$tdir > /dev/null || error } run_test 51a "special situations: split htree with empty entry ==" export NUMTEST=70000 test_51b() { local BASE=$DIR/$tdir - mkdir -p $BASE + + test_mkdir -p $BASE local mdtidx=$(printf "%04x" $($LFS getstripe -M $BASE)) local numfree=$(lctl get_param -n mdc.$FSNAME-MDT$mdtidx*.filesfree) @@ -3233,67 +3495,17 @@ test_51ba() { # LU-993 } run_test 51ba "verify nlink for many subdirectory cleanup" -test_51bb() { - [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return - - local ndirs=${TEST51BB_NDIRS:-10} - local nfiles=${TEST51BB_NFILES:-100} - - local numfree=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'` - - [ $numfree -lt $(( ndirs * nfiles)) ] && \ - nfiles=$(( numfree / ndirs - 10 )) - - local dir=$DIR/d51bb - mkdir -p $dir - local savePOLICY=$(lctl get_param -n lmv.*.placement) - lctl set_param -n lmv.*.placement=CHAR - - lfs df -i $dir - local IUSED=$(lfs df -i $dir | grep MDT | awk '{print $3}') - OLDUSED=($IUSED) - - declare -a dirs - for ((i=0; i < $ndirs; i++)); do - dirs[i]=$dir/$RANDOM - echo Creating directory ${dirs[i]} - mkdir -p ${dirs[i]} - ls $dir - echo Creating $nfiles in dir ${dirs[i]} ... - echo "createmany -o ${dirs[i]}/$tfile- $nfiles" - createmany -o ${dirs[i]}/$tfile- $nfiles - done - ls $dir - - sleep 1 - - IUSED=$(lfs df -i $dir | grep MDT | awk '{print $3}') - NEWUSED=($IUSED) - - local rc=0 - for ((i=0; i<${#NEWUSED[@]}; i++)); do - echo "mds $i: inodes count OLD ${OLDUSED[$i]} NEW ${NEWUSED[$i]}" - [ ${OLDUSED[$i]} -lt ${NEWUSED[$i]} ] || rc=$((rc + 1)) - done - - lctl set_param -n lmv.*.placement=$savePOLICY - - [ $rc -ne $MDSCOUNT ] || \ - error "Objects/inodes are not distributed over all mds servers" -} -run_test 51bb "mkdir createmany CMD $MDSCOUNT ====================" - test_51d() { [ "$OSTCOUNT" -lt "3" ] && skip_env "skipping test with few OSTs" && return - mkdir -p $DIR/d51d - createmany -o $DIR/d51d/t- 1000 - $GETSTRIPE $DIR/d51d > $TMP/files + test_mkdir -p $DIR/$tdir + createmany -o $DIR/$tdir/t- 1000 + $GETSTRIPE $DIR/$tdir > $TMP/files for N in `seq 0 $((OSTCOUNT - 1))`; do OBJS[$N]=`awk -vobjs=0 '($1 == '$N') { objs += 1 } END { print objs;}' $TMP/files` OBJS0[$N]=`grep -A 1 idx $TMP/files | awk -vobjs=0 '($1 == '$N') { objs += 1 } END { print objs;}'` log "OST$N has ${OBJS[$N]} objects, ${OBJS0[$N]} are index 0" done - unlinkmany $DIR/d51d/t- 1000 + unlinkmany $DIR/$tdir/t- 1000 NLAST=0 for N in `seq 1 $((OSTCOUNT - 1))`; do @@ -3312,40 +3524,44 @@ test_51d() { run_test 51d "check object distribution ====================" test_52a() { - [ -f $DIR/d52a/foo ] && chattr -a $DIR/d52a/foo - mkdir -p $DIR/d52a - touch $DIR/d52a/foo - chattr +a $DIR/d52a/foo || error "chattr +a failed" - echo bar >> $DIR/d52a/foo || error "append bar failed" - cp /etc/hosts $DIR/d52a/foo && error "cp worked" - rm -f $DIR/d52a/foo 2>/dev/null && error "rm worked" - link $DIR/d52a/foo $DIR/d52a/foo_link 2>/dev/null && error "link worked" - echo foo >> $DIR/d52a/foo || error "append foo failed" - mrename $DIR/d52a/foo $DIR/d52a/foo_ren && error "rename worked" - lsattr $DIR/d52a/foo | egrep -q "^-+a[-e]+ $DIR/d52a/foo" || error "lsattr" - chattr -a $DIR/d52a/foo || error "chattr -a failed" - cp -r $DIR/d52a /tmp/ - rm -fr $DIR/d52a || error "cleanup rm failed" + [ -f $DIR/$tdir/foo ] && chattr -a $DIR/$tdir/foo + test_mkdir -p $DIR/$tdir + touch $DIR/$tdir/foo + chattr +a $DIR/$tdir/foo || error "chattr +a failed" + echo bar >> $DIR/$tdir/foo || error "append bar failed" + cp /etc/hosts $DIR/$tdir/foo && error "cp worked" + rm -f $DIR/$tdir/foo 2>/dev/null && error "rm worked" + link $DIR/$tdir/foo $DIR/$tdir/foo_link 2>/dev/null && + error "link worked" + echo foo >> $DIR/$tdir/foo || error "append foo failed" + mrename $DIR/$tdir/foo $DIR/$tdir/foo_ren && error "rename worked" + lsattr $DIR/$tdir/foo | egrep -q "^-+a[-e]+ $DIR/$tdir/foo" || + error "lsattr" + chattr -a $DIR/$tdir/foo || error "chattr -a failed" + cp -r $DIR/$tdir /tmp/ + rm -fr $DIR/$tdir || error "cleanup rm failed" } run_test 52a "append-only flag test (should return errors) =====" test_52b() { - [ -f $DIR/d52b/foo ] && chattr -i $DIR/d52b/foo - mkdir -p $DIR/d52b - touch $DIR/d52b/foo - chattr +i $DIR/d52b/foo || error "chattr +i failed" - cat test > $DIR/d52b/foo && error "cat test worked" - cp /etc/hosts $DIR/d52b/foo && error "cp worked" - rm -f $DIR/d52b/foo 2>/dev/null && error "rm worked" - link $DIR/d52b/foo $DIR/d52b/foo_link 2>/dev/null && error "link worked" - echo foo >> $DIR/d52b/foo && error "echo worked" - mrename $DIR/d52b/foo $DIR/d52b/foo_ren && error "rename worked" - [ -f $DIR/d52b/foo ] || error - [ -f $DIR/d52b/foo_ren ] && error - lsattr $DIR/d52b/foo | egrep -q "^-+i[-e]+ $DIR/d52b/foo" || error "lsattr" - chattr -i $DIR/d52b/foo || error "chattr failed" - - rm -fr $DIR/d52b || error + [ -f $DIR/$tdir/foo ] && chattr -i $DIR/$tdir/foo + test_mkdir -p $DIR/$tdir + touch $DIR/$tdir/foo + chattr +i $DIR/$tdir/foo || error "chattr +i failed" + cat test > $DIR/$tdir/foo && error "cat test worked" + cp /etc/hosts $DIR/$tdir/foo && error "cp worked" + rm -f $DIR/$tdir/foo 2>/dev/null && error "rm worked" + link $DIR/$tdir/foo $DIR/$tdir/foo_link 2>/dev/null && + error "link worked" + echo foo >> $DIR/$tdir/foo && error "echo worked" + mrename $DIR/$tdir/foo $DIR/$tdir/foo_ren && error "rename worked" + [ -f $DIR/$tdir/foo ] || error + [ -f $DIR/$tdir/foo_ren ] && error + lsattr $DIR/$tdir/foo | egrep -q "^-+i[-e]+ $DIR/$tdir/foo" || + error "lsattr" + chattr -i $DIR/$tdir/foo || error "chattr failed" + + rm -fr $DIR/$tdir || error } run_test 52b "immutable flag test (should return errors) =======" @@ -3417,7 +3633,7 @@ test_54c() { dd if=/dev/zero of=$tfile bs=`page_size` seek=1024 count=1 > /dev/null losetup $loopdev $tfile || error "can't set up $loopdev for $tfile" mkfs.ext2 $loopdev || error "mke2fs on $loopdev" - mkdir -p $tdir + test_mkdir -p $tdir mount -t ext2 $loopdev $tdir || error "error mounting $loopdev on $tdir" dd if=/dev/zero of=$tdir/tmp bs=`page_size` count=30 || error "dd write" df $tdir @@ -3449,41 +3665,43 @@ run_test 54e "console/tty device works in lustre ======================" #run_test 55 "check iopen_connect_dentry() ======================" test_56a() { # was test_56 - rm -rf $DIR/d56 + rm -rf $DIR/$tdir $SETSTRIPE -d $DIR - mkdir $DIR/d56 - mkdir $DIR/d56/dir + test_mkdir $DIR/$tdir + test_mkdir $DIR/$tdir/dir NUMFILES=3 NUMFILESx2=$(($NUMFILES * 2)) for i in `seq 1 $NUMFILES` ; do - touch $DIR/d56/file$i - touch $DIR/d56/dir/file$i + touch $DIR/$tdir/file$i + touch $DIR/$tdir/dir/file$i done # test lfs getstripe with --recursive - FILENUM=`$GETSTRIPE --recursive $DIR/d56 | grep -c obdidx` + FILENUM=`$GETSTRIPE --recursive $DIR/$tdir | grep -c obdidx` [ $FILENUM -eq $NUMFILESx2 ] || error "$GETSTRIPE --recursive: found $FILENUM, not $NUMFILESx2" - FILENUM=`$GETSTRIPE $DIR/d56 | grep -c obdidx` + FILENUM=`$GETSTRIPE $DIR/$tdir | grep -c obdidx` [ $FILENUM -eq $NUMFILES ] || - error "$GETSTRIPE $DIR/d56: found $FILENUM, not $NUMFILES" + error "$GETSTRIPE $DIR/$tdir: found $FILENUM, not $NUMFILES" echo "$GETSTRIPE --recursive passed." # test lfs getstripe with file instead of dir - FILENUM=`$GETSTRIPE $DIR/d56/file1 | grep -c obdidx` + FILENUM=`$GETSTRIPE $DIR/$tdir/file1 | grep -c obdidx` [ $FILENUM -eq 1 ] || error \ - "$GETSTRIPE $DIR/d56/file1: found $FILENUM, not 1" + "$GETSTRIPE $DIR/$tdir/file1: found $FILENUM, not 1" echo "$GETSTRIPE file1 passed." #test lfs getstripe with --verbose - [ `$GETSTRIPE --verbose $DIR/d56 | grep -c lmm_magic` -eq $NUMFILES ] || - error "$GETSTRIPE --verbose $DIR/d56: want $NUMFILES lmm_magic" - [ `$GETSTRIPE $DIR/d56 | grep -c lmm_magic` -eq 0 ] || - error "$GETSTRIPE $DIR/d56: showed lmm_magic" + [ `$GETSTRIPE --verbose $DIR/$tdir | + grep -c lmm_magic` -eq $NUMFILES ] || + error "$GETSTRIPE --verbose $DIR/$tdir: want $NUMFILES" + [ `$GETSTRIPE $DIR/$tdir | grep -c lmm_magic` -eq 0 ] || + error "$GETSTRIPE $DIR/$tdir: showed lmm_magic" echo "$GETSTRIPE --verbose passed." #test lfs getstripe with --obd - $GETSTRIPE --obd wrong_uuid $DIR/d56 2>&1 | grep -q "unknown obduuid" || + $GETSTRIPE --obd wrong_uuid $DIR/$tdir 2>&1 | + grep -q "unknown obduuid" || error "$GETSTRIPE --obd wrong_uuid should return error message" [ "$OSTCOUNT" -lt 2 ] && @@ -3491,11 +3709,11 @@ test_56a() { # was test_56 OSTIDX=1 OBDUUID=$(ostuuid_from_index $OSTIDX) - FILENUM=`$GETSTRIPE -ir $DIR/d56 | grep -x $OSTIDX | wc -l` - FOUND=`$GETSTRIPE -r --obd $OBDUUID $DIR/d56 | grep obdidx | wc -l` + FILENUM=`$GETSTRIPE -ir $DIR/$tdir | grep -x $OSTIDX | wc -l` + FOUND=`$GETSTRIPE -r --obd $OBDUUID $DIR/$tdir | grep obdidx | wc -l` [ $FOUND -eq $FILENUM ] || error "$GETSTRIPE --obd wrong: found $FOUND, expected $FILENUM" - [ `$GETSTRIPE -r -v --obd $OBDUUID $DIR/d56 | + [ `$GETSTRIPE -r -v --obd $OBDUUID $DIR/$tdir | sed '/^[ ]*'${OSTIDX}'[ ]/d' | sed -n '/^[ ]*[0-9][0-9]*[ ]/p' | wc -l` -eq 0 ] || error "$GETSTRIPE --obd: should not show file on other obd" @@ -3511,13 +3729,13 @@ setup_56() { local MKDIR_PARAMS="$3" if [ ! -d "$TDIR" ] ; then - mkdir -p $TDIR + test_mkdir -p $TDIR [ "$MKDIR_PARAMS" ] && $SETSTRIPE $MKDIR_PARAMS $TDIR for i in `seq 1 $LOCAL_NUMFILES` ; do touch $TDIR/file$i done for i in `seq 1 $LOCAL_NUMDIRS` ; do - mkdir $TDIR/dir$i + test_mkdir $TDIR/dir$i for j in `seq 1 $LOCAL_NUMFILES` ; do touch $TDIR/dir$i/file$j done @@ -3579,7 +3797,7 @@ run_test 56h "check lfs find ! -name =============================" test_56i() { tdir=${tdir}i - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir UUID=$(ostuuid_from_index 0 $DIR/$tdir) CMD="$LFIND -ost $UUID $DIR/$tdir" OUT=$($CMD) @@ -4045,7 +4263,7 @@ test_57b() { local FILEN=$dir/f$FILECOUNT rm -rf $dir || error "removing $dir" - mkdir -p $dir || error "creating $dir" + test_mkdir -p $dir || error "creating $dir" local num=$(get_mds_dir $dir) local mymds=mds$num @@ -4102,8 +4320,8 @@ test_59() { echo "rm 130 files" unlinkmany $DIR/f59- 130 sync - sleep 2 - # wait for commitment of removal + # wait for commitment of removal + wait_delete_completed } run_test 59 "verify cancellation of llog records async =========" @@ -4234,35 +4452,41 @@ test_64b () { } run_test 64b "check out-of-space detection on client ===========" +test_64c() { + $LCTL set_param osc.*OST0000-osc-[^mM]*.cur_grant_bytes=0 +} +run_test 64c "verify grant shrink ========================------" + # bug 1414 - set/get directories' stripe info test_65a() { - mkdir -p $DIR/d65 - touch $DIR/d65/f1 - $LVERIFY $DIR/d65 $DIR/d65/f1 || error "lverify failed" + test_mkdir -p $DIR/$tdir + touch $DIR/$tdir/f1 + $LVERIFY $DIR/$tdir $DIR/$tdir/f1 || error "lverify failed" } run_test 65a "directory with no stripe info ====================" test_65b() { - mkdir -p $DIR/d65 - $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/d65||error "setstripe" - touch $DIR/d65/f2 - $LVERIFY $DIR/d65 $DIR/d65/f2 || error "lverify failed" + test_mkdir -p $DIR/$tdir + $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/$tdir || + error "setstripe" + touch $DIR/$tdir/f2 + $LVERIFY $DIR/$tdir $DIR/$tdir/f2 || error "lverify failed" } run_test 65b "directory setstripe -S $((STRIPESIZE * 2)) -i 0 -c 1" test_65c() { if [ $OSTCOUNT -gt 1 ]; then - mkdir -p $DIR/d65 + test_mkdir -p $DIR/$tdir $SETSTRIPE -S $(($STRIPESIZE * 4)) -i 1 \ - -c $(($OSTCOUNT - 1)) $DIR/d65 || error "setstripe" - touch $DIR/d65/f3 - $LVERIFY $DIR/d65 $DIR/d65/f3 || error "lverify failed" + -c $(($OSTCOUNT - 1)) $DIR/$tdir || error "setstripe" + touch $DIR/$tdir/f3 + $LVERIFY $DIR/$tdir $DIR/$tdir/f3 || error "lverify failed" fi } run_test 65c "directory setstripe -S $((STRIPESIZE*4)) -i 1 -c $((OSTCOUNT-1))" test_65d() { - mkdir -p $DIR/d65 + test_mkdir -p $DIR/$tdir if [ $STRIPECOUNT -le 0 ]; then sc=1 elif [ $STRIPECOUNT -gt 2000 ]; then @@ -4271,42 +4495,46 @@ test_65d() { else sc=$(($STRIPECOUNT - 1)) fi - $SETSTRIPE -S $STRIPESIZE -c $sc $DIR/d65 || error "setstripe" - touch $DIR/d65/f4 $DIR/d65/f5 - $LVERIFY $DIR/d65 $DIR/d65/f4 $DIR/d65/f5 || error "lverify failed" + $SETSTRIPE -S $STRIPESIZE -c $sc $DIR/$tdir || error "setstripe" + touch $DIR/$tdir/f4 $DIR/$tdir/f5 + $LVERIFY $DIR/$tdir $DIR/$tdir/f4 $DIR/$tdir/f5 || + error "lverify failed" } run_test 65d "directory setstripe -S $STRIPESIZE -c stripe_count" test_65e() { - mkdir -p $DIR/d65 + test_mkdir -p $DIR/$tdir - $SETSTRIPE $DIR/d65 || error "setstripe" - $GETSTRIPE -v $DIR/d65 | grep "Default" || error "no stripe info failed" - touch $DIR/d65/f6 - $LVERIFY $DIR/d65 $DIR/d65/f6 || error "lverify failed" + $SETSTRIPE $DIR/$tdir || error "setstripe" + $GETSTRIPE -v $DIR/$tdir | grep "Default" || + error "no stripe info failed" + touch $DIR/$tdir/f6 + $LVERIFY $DIR/$tdir $DIR/$tdir/f6 || error "lverify failed" } run_test 65e "directory setstripe defaults =======================" test_65f() { - mkdir -p $DIR/d65f - $RUNAS $SETSTRIPE $DIR/d65f && error "setstripe succeeded" || true + test_mkdir -p $DIR/${tdir}f + $RUNAS $SETSTRIPE $DIR/${tdir}f && error "setstripe succeeded" || true } run_test 65f "dir setstripe permission (should return error) ===" test_65g() { - mkdir -p $DIR/d65 - $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/d65 ||error "setstripe" - $SETSTRIPE -d $DIR/d65 || error "setstripe" - $GETSTRIPE -v $DIR/d65 | grep "Default" || \ + test_mkdir -p $DIR/$tdir + $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/$tdir || + error "setstripe" + $SETSTRIPE -d $DIR/$tdir || error "setstripe" + $GETSTRIPE -v $DIR/$tdir | grep "Default" || error "delete default stripe failed" } run_test 65g "directory setstripe -d ===========================" test_65h() { - mkdir -p $DIR/d65 - $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/d65 ||error "setstripe" - mkdir -p $DIR/d65/dd1 - [ $($GETSTRIPE -c $DIR/d65) == $($GETSTRIPE -c $DIR/d65/dd1) ] || + test_mkdir -p $DIR/$tdir + $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/$tdir || + error "setstripe" + test_mkdir -p $DIR/$tdir/dd1 + [ $($GETSTRIPE -c $DIR/$tdir) == $($GETSTRIPE -c $DIR/$tdir/dd1) ] || error "stripe info inherit failed" } run_test 65h "directory stripe info inherit ====================" @@ -4355,7 +4583,7 @@ test_65k() { # bug11679 do_facet $SINGLEMDS lctl --device %$OSC activate done - do_facet client mkdir -p $DIR/$tdir + mkdir -p $DIR/$tdir for INACTIVE_OSC in $MDS_OSCS; do echo "Deactivate: " $INACTIVE_OSC do_facet $SINGLEMDS lctl --device %$INACTIVE_OSC deactivate @@ -4366,11 +4594,11 @@ test_65k() { # bug11679 [ -f $DIR/$tdir/$IDX ] && continue echo "$SETSTRIPE -i $IDX -c 1 $DIR/$tdir/$IDX" - do_facet client $SETSTRIPE -i $IDX -c 1 $DIR/$tdir/$IDX + $SETSTRIPE -i $IDX -c 1 $DIR/$tdir/$IDX RC=$? [ $RC -ne 0 ] && error "setstripe should have succeeded" done - do_facet client rm -f $DIR/$tdir/* + rm -f $DIR/$tdir/* echo $INACTIVE_OSC "is Activate." do_facet $SINGLEMDS lctl --device %$INACTIVE_OSC activate done @@ -4378,7 +4606,7 @@ test_65k() { # bug11679 run_test 65k "validate manual striping works properly with deactivated OSCs" test_65l() { # bug 12836 - mkdir -p $DIR/$tdir/test_dir + test_mkdir -p $DIR/$tdir/test_dir $SETSTRIPE -c -1 $DIR/$tdir/test_dir $LFS find -mtime -1 $DIR/$tdir >/dev/null } @@ -4518,7 +4746,7 @@ test_69() { run_test 69 "verify oa2dentry return -ENOENT doesn't LBUG ======" test_71() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir sh rundbench -C -D $DIR/$tdir 2 || error "dbench failed!" } run_test 71 "Running dbench on lustre (don't segment fault) ====" @@ -4543,7 +4771,6 @@ test_72a() { # bug 5695 - Test that on 2.6 remove_suid works properly # Now test that MDS is updated too cancel_lru_locks mdc test -u $DIR/f72 -o -g $DIR/f72 && error "S/gid is not dropped on MDS" - true rm -f $DIR/f72 } run_test 72a "Test that remove suid works properly (bug5695) ====" @@ -4562,7 +4789,8 @@ test_72b() { # bug 24226 -- keep mode setting when size is not changing return 0 } touch $DIR/${tfile}-f{g,u} - mkdir $DIR/${tfile}-d{g,u} + test_mkdir $DIR/${tfile}-dg + test_mkdir $DIR/${tfile}-du chmod 770 $DIR/${tfile}-{f,d}{g,u} chmod g+s $DIR/${tfile}-{f,d}g chmod u+s $DIR/${tfile}-{f,d}u @@ -4578,8 +4806,8 @@ run_test 72b "Test that we keep mode setting if without file data changed (bug 2 # bug 3462 - multiple simultaneous MDC requests test_73() { - mkdir $DIR/d73-1 - mkdir $DIR/d73-2 + test_mkdir $DIR/d73-1 + test_mkdir $DIR/d73-2 multiop_bg_pause $DIR/d73-1/f73-1 O_c || return 1 pid1=$! @@ -4946,7 +5174,7 @@ test_80() { # bug 10718 local soc="obdfilter.*.sync_on_lock_cancel" local soc_old=$(do_facet ost1 lctl get_param -n $soc | head -n1) local hosts= - if [ "$soc_old" != "never" -a "$FSTYPE" != "ldiskfs" ]; then + if [ "$soc_old" != "never" -a "$(facet_fstype ost1)" != "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 @@ -4964,7 +5192,6 @@ test_80() { # bug 10718 [ -n "$hosts" ] && do_nodes $hosts lctl set_param $soc=$soc_old - true rm -f $DIR/$tfile } run_test 80 "Page eviction is equally fast at high offsets too ====" @@ -5027,7 +5254,7 @@ run_test 82 "Basic grouplock test ===============================" test_99a() { [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && \ return - mkdir -p $DIR/d99cvsroot + test_mkdir -p $DIR/d99cvsroot chown $RUNAS_ID $DIR/d99cvsroot local oldPWD=$PWD # bug 13584, use $TMP as working dir cd $TMP @@ -5054,7 +5281,7 @@ test_99c() { [ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs" && return [ ! -d $DIR/d99cvsroot ] && test_99b cd $DIR - mkdir -p $DIR/d99reposname + test_mkdir -p $DIR/d99reposname chown $RUNAS_ID $DIR/d99reposname $RUNAS cvs -d $DIR/d99cvsroot co d99reposname } @@ -5170,7 +5397,7 @@ test_101a() { run_test 101a "check read-ahead for random reads ================" setup_test101bc() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir STRIPE_SIZE=1048576 STRIPE_COUNT=$OSTCOUNT STRIPE_OFFSET=0 @@ -5296,12 +5523,12 @@ test_101d() { local size=${FILESIZE_101c:-500} local ra_MB=${READAHEAD_MB:-40} - local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }') - [ $space -gt $((size / 1024)) ] || - { skip "Need free space ${size}M, have $space" && return; } + local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }') + [ $space -gt $((size * 1024)) ] || + { skip "Need free space ${size}M, have $space" && return; } echo Creating ${size}M test file $file - dd if=/dev/zero of=$file bs=1M count=$size + dd if=/dev/zero of=$file bs=1M count=$size || error "dd failed" echo Cancel LRU locks on lustre client to flush the client cache cancel_lru_locks osc @@ -5406,7 +5633,7 @@ test_101f() { run_test 101f "check read-ahead for max_read_ahead_whole_mb" setup_test102() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir chown $RUNAS_ID $DIR/$tdir STRIPE_SIZE=65536 STRIPE_OFFSET=1 @@ -5526,7 +5753,7 @@ test_102c() { # b10930: get/set/list lustre.lov xattr echo "get/set/list lustre.lov xattr ..." [ "$OSTCOUNT" -lt "2" ] && skip_env "skipping 2-stripe test" && return - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir chown $RUNAS_ID $DIR/$tdir local testfile=$DIR/$tdir/$tfile $RUNAS $SETSTRIPE -S 65536 -i 1 -c $OSTCOUNT $testfile || @@ -5587,7 +5814,7 @@ test_102d() { [ -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 + test_mkdir -p $DIR/d102d $TAR xf $TMP/f102.tar -C $DIR/d102d --xattrs cd $DIR/d102d/$tdir compare_stripe_info1 @@ -5600,7 +5827,7 @@ test_102f() { [ -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 + test_mkdir -p $DIR/d102f cd $DIR $TAR cf - --xattrs $tdir | $TAR xf - --xattrs -C $DIR/d102f cd $DIR/d102f/$tdir @@ -5674,7 +5901,7 @@ test_102j() { [ -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 + test_mkdir -p $DIR/d102j chown $RUNAS_ID $DIR/d102j $RUNAS $TAR xf $TMP/f102.tar -C $DIR/d102j --xattrs cd $DIR/d102j/$tdir @@ -5688,7 +5915,7 @@ test_102k() { setfattr -n trusted.lov $DIR/$tfile # b22187 'setfattr -n trusted.lov' should work as remove LOV EA for directories local test_kdir=$DIR/d102k - mkdir $test_kdir + test_mkdir $test_kdir local default_size=`$GETSTRIPE -S $test_kdir` local default_count=`$GETSTRIPE -c $test_kdir` local default_offset=`$GETSTRIPE -i $test_kdir` @@ -5740,9 +5967,9 @@ test_103 () { declare -a identity_old - for num in `seq $MDSCOUNT`; do - switch_identity $num true || identity_old[$num]=$? - done + for num in $(seq $MDSCOUNT); do + switch_identity $num true || identity_old[$num]=$? + done SAVE_UMASK=`umask` umask 0022 @@ -5766,14 +5993,20 @@ test_103 () { run_acl_subtest inheritance || error "inheritance test failed" rm -f make-tree + echo "LU-974 ignore umask when acl is enabled..." + mkdir $DIR/974 + cd $DIR/974 + run_acl_subtest 974 || error "LU-974 test failed" + rm -rf $DIR/974 + cd $SAVE_PWD umask $SAVE_UMASK - for num in `seq $MDSCOUNT`; do - if [ "${identity_old[$num]}" = 1 ]; then - switch_identity $num false || identity_old[$num]=$? - fi - done + for num in $(seq $MDSCOUNT); do + if [ "${identity_old[$num]}" = 1 ]; then + switch_identity $num false || identity_old[$num]=$? + fi + done } run_test 103 "acl test =========================================" @@ -5847,7 +6080,7 @@ test_105c() { run_test 105c "lockf when mounted without -o flock test ========" test_105d() { # bug 15924 - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir [ -z "`mount | grep \"$DIR.*flock\" | grep -v noflock`" ] && \ skip "mount w/o flock enabled" && return #define OBD_FAIL_LDLM_CP_CB_WAIT 0x315 @@ -5865,7 +6098,7 @@ test_105e() { # bug 22660 && 22040 run_test 105e "Two conflicting flocks from same process =======" test_106() { #bug 10921 - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $DIR/$tdir && error "exec $DIR/$tdir succeeded" chmod 777 $DIR/$tdir || error "chmod $DIR/$tdir failed" } @@ -5905,14 +6138,18 @@ test_107() { run_test 107 "Coredump on SIG" test_110() { - mkdir -p $DIR/d110 - mkdir $DIR/d110/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || error "mkdir with 255 char fail" - mkdir $DIR/d110/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb && error "mkdir with 256 char should fail, but not" - touch $DIR/d110/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx || error "create with 255 char fail" - touch $DIR/d110/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy && error ""create with 256 char should fail, but not - - ls -l $DIR/d110 - rm -fr $DIR/d110 + test_mkdir -p $DIR/$tdir + test_mkdir $DIR/$tdir/$(str_repeat 'a' 255) || + error "mkdir with 255 char failed" + test_mkdir $DIR/$tdir/$(str_repeat 'b' 256) && + error "mkdir with 256 char should fail, but did not" + touch $DIR/$tdir/$(str_repeat 'x' 255) || + error "create with 255 char failed" + touch $DIR/$tdir/$(str_repeat 'y' 256) && + error "create with 256 char should fail, but did not" + + ls -l $DIR/$tdir + rm -rf $DIR/$tdir } run_test 110 "filename length checking" @@ -5927,7 +6164,7 @@ test_115() { NUMFREE=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'` [ $NUMFREE -lt $NUMTEST ] && NUMTEST=$(($NUMFREE - 1000)) echo "$NUMTEST creates/unlinks" - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir createmany -o $DIR/$tdir/$tfile $NUMTEST unlinkmany $DIR/$tdir/$tfile $NUMTEST @@ -5974,7 +6211,7 @@ test_116a() { # was previously test_116() return # generate uneven OSTs - mkdir -p $DIR/$tdir/OST${MINI} + test_mkdir -p $DIR/$tdir/OST${MINI} declare -i FILL FILL=$(($MINV / 4)) echo "Filling 25% remaining space in OST${MINI} with ${FILL}Kb" @@ -6418,7 +6655,7 @@ test_118k() #define OBD_FAIL_OST_BRW_WRITE_BULK 0x20e set_nodes_failloc "$(osts_nodes)" 0x20e - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir for ((i=0;i<10;i++)); do (dd if=/dev/zero of=$DIR/$tdir/$tfile-$i bs=1M count=10 || \ @@ -6437,7 +6674,7 @@ run_test 118k "bio alloc -ENOMEM and IO TERM handling =========" test_118l() { # LU-646 - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $MULTIOP $DIR/$tdir Dy || error "fsync dir failed" rm -rf $DIR/$tdir } @@ -6509,7 +6746,7 @@ test_119d() # bug 15950 run_test 119d "The DIO path should try to send a new rpc once one is completed" test_120a() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \ skip "no early lock cancel on server" && return 0 lru_resize_disable mdc @@ -6518,7 +6755,7 @@ test_120a() { stat $DIR/$tdir > /dev/null can1=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'` blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'` - mkdir $DIR/$tdir/d1 + test_mkdir $DIR/$tdir/d1 can2=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'` blk2=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'` [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." @@ -6529,7 +6766,7 @@ test_120a() { run_test 120a "Early Lock Cancel: mkdir test" test_120b() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \ skip "no early lock cancel on server" && return 0 lru_resize_disable mdc @@ -6549,12 +6786,12 @@ test_120b() { run_test 120b "Early Lock Cancel: create test" test_120c() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \ skip "no early lock cancel on server" && return 0 lru_resize_disable mdc lru_resize_disable osc - mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2 + test_mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2 touch $DIR/$tdir/d1/f1 cancel_lru_locks mdc stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 > /dev/null @@ -6571,7 +6808,7 @@ test_120c() { run_test 120c "Early Lock Cancel: link test" test_120d() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \ skip "no early lock cancel on server" && return 0 lru_resize_disable mdc @@ -6592,7 +6829,7 @@ test_120d() { run_test 120d "Early Lock Cancel: setattr test" test_120e() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \ skip "no early lock cancel on server" && return 0 lru_resize_disable mdc @@ -6621,10 +6858,10 @@ run_test 120e "Early Lock Cancel: unlink test" test_120f() { [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \ skip "no early lock cancel on server" && return 0 - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir lru_resize_disable mdc lru_resize_disable osc - mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2 + test_mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2 dd if=/dev/zero of=$DIR/$tdir/d1/f1 count=1 dd if=/dev/zero of=$DIR/$tdir/d2/f2 count=1 cancel_lru_locks mdc @@ -6655,7 +6892,7 @@ test_120g() { lru_resize_disable osc count=10000 echo create $count files - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir cancel_lru_locks mdc cancel_lru_locks osc t0=`date +%s` @@ -6709,7 +6946,7 @@ test_123a() { # was test 123, statahead(bug 11401) fi rm -rf $DIR/$tdir - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir NUMFREE=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'` [ $NUMFREE -gt 100000 ] && NUMFREE=100000 || NUMFREE=$((NUMFREE-1000)) MULT=10 @@ -6783,7 +7020,7 @@ test_123a() { # was test 123, statahead(bug 11401) run_test 123a "verify statahead work" test_123b () { # statahead(bug 15027) - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir createmany -o $DIR/$tdir/$tfile-%d 1000 cancel_lru_locks mdc @@ -6805,7 +7042,7 @@ test_124a() { [ -z "`lctl get_param -n mdc.*.connect_flags | grep lru_resize`" ] && \ skip "no lru resize on server" && return 0 local NR=2000 - mkdir -p $DIR/$tdir || error "failed to create $DIR/$tdir" + test_mkdir -p $DIR/$tdir || error "failed to create $DIR/$tdir" log "create $NR files at $DIR/$tdir" createmany -o $DIR/$tdir/f $NR || @@ -6909,7 +7146,7 @@ test_124b() { NR=$LIMIT fi lru_resize_disable mdc - mkdir -p $DIR/$tdir/disable_lru_resize || + test_mkdir -p $DIR/$tdir/disable_lru_resize || error "failed to create $DIR/$tdir/disable_lru_resize" createmany -o $DIR/$tdir/disable_lru_resize/f $NR @@ -6933,7 +7170,7 @@ test_124b() { unlinkmany $DIR/$tdir/disable_lru_resize/f $NR lru_resize_enable mdc - mkdir -p $DIR/$tdir/enable_lru_resize || + test_mkdir -p $DIR/$tdir/enable_lru_resize || error "failed to create $DIR/$tdir/enable_lru_resize" createmany -o $DIR/$tdir/enable_lru_resize/f $NR @@ -6969,7 +7206,7 @@ run_test 124b "lru resize (performance test) =======================" test_125() { # 13358 [ -z "$(lctl get_param -n llite.*.client_type | grep local)" ] && skip "must run as local client" && return [ -z "$(lctl get_param -n mdc.*-mdc-*.connect_flags | grep acl)" ] && skip "must have acl enabled" && return - mkdir -p $DIR/d125 || error "mkdir failed" + test_mkdir -p $DIR/d125 || error "mkdir failed" $SETSTRIPE -S 65536 -c -1 $DIR/d125 || error "setstripe failed" setfacl -R -m u:bin:rwx $DIR/d125 || error "setfacl $DIR/d125 failed" ls -ld $DIR/d125 || error "cannot access $DIR/d125" @@ -7085,13 +7322,17 @@ set_dir_limits () { local node local LDPROC=/proc/fs/ldiskfs + local facets=$(get_facets MDS) - for facet in $(get_facets MDS); do - canondev=$(ldiskfs_canon *.$(convert_facet2label $facet).mntdev $facet) - do_facet $facet "test -e $LDPROC/$canondev/max_dir_size" || LDPROC=/sys/fs/ldiskfs + for facet in ${facets//,/ }; do + canondev=$(ldiskfs_canon \ + *.$(convert_facet2label $facet).mntdev $facet) + do_facet $facet "test -e $LDPROC/$canondev/max_dir_size" || + LDPROC=/sys/fs/ldiskfs do_facet $facet "echo $1 >$LDPROC/$canondev/max_dir_size" done } + test_129() { if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then skip "Only applicable to ldiskfs-based MDTs" @@ -7103,11 +7344,10 @@ test_129() { MAX=16384 set_dir_limits $MAX + test_mkdir -p $DIR/$tdir - mkdir -p $DIR/$tdir - - I=0 - J=0 + local I=0 + local J=0 while [ ! $I -gt $((MAX * MDSCOUNT)) ]; do $MULTIOP $DIR/$tdir/$J Oc rc=$? @@ -7619,7 +7859,7 @@ test_133c() { remote_ost_nodsh && skip "remote OST with nodsh" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return local testdir=$DIR/${tdir}/stats_testdir - mkdir -p ${testdir} || error "mkdir failed" + test_mkdir -p ${testdir} || error "mkdir failed" # verify obdfilter stats. $SETSTRIPE -c 1 -i 0 ${testdir}/${tfile} @@ -7692,8 +7932,10 @@ size_in_KMGT() { get_rename_size() { local size=$1 + local context=${2:-.} local sample=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats | - awk '/ '${size}'/ {print $4}' | sed -e "s/,//g") + grep -A1 $context | + awk '/ '${size}'/ {print $4}' | sed -e "s/,//g") echo $sample } @@ -7708,8 +7950,8 @@ test_133d() { do_facet $SINGLEMDS $LCTL set_param mdt.*.rename_stats=clear - mkdir -p ${testdir1} || error "mkdir failed" - mkdir -p ${testdir2} || error "mkdir failed" + test_mkdir -p ${testdir1} || error "mkdir failed" + test_mkdir -p ${testdir2} || error "mkdir failed" createmany -o $testdir1/test 512 || error "createmany failed" @@ -7759,8 +8001,8 @@ test_133d() { eval $cmd || error "$cmd failed" local crossdir=$($cmd | grep 'crossdir') - local src_sample=$(get_rename_size $testdir1_size) - local tgt_sample=$(get_rename_size $testdir2_size) + local src_sample=$(get_rename_size $testdir1_size crossdir_src) + local tgt_sample=$(get_rename_size $testdir2_size crossdir_tgt) [ -z "$crossdir" ] && error "crossdir_rename_size count error" [ "$src_sample" -eq 1 ] || error "crossdir_rename_size error $src_sample" [ "$tgt_sample" -eq 1 ] || error "crossdir_rename_size error $tgt_sample" @@ -7770,14 +8012,15 @@ test_133d() { run_test 133d "Verifying rename_stats ========================================" test_140() { #bug-17379 - mkdir -p $DIR/$tdir || error "Creating dir $DIR/$tdir" + test_mkdir -p $DIR/$tdir || error "Creating dir $DIR/$tdir" cd $DIR/$tdir || error "Changing to $DIR/$tdir" cp /usr/bin/stat . || error "Copying stat to $DIR/$tdir" - # VFS limits max symlink depth to 5(4KSTACK) or 7(8KSTACK) or 8 - local i=0 + # VFS limits max symlink depth to 5(4KSTACK) or 7(8KSTACK) or 8 + # For kernel > 3.5, bellow only tests consecutive symlink (MAX 40) + local i=0 while i=`expr $i + 1`; do - mkdir -p $i || error "Creating dir $i" + test_mkdir -p $i || error "Creating dir $i" cd $i || error "Changing to $i" ln -s ../stat stat || error "Creating stat symlink" # Read the symlink until ELOOP present, @@ -7795,7 +8038,14 @@ test_140() { #bug-17379 done i=`expr $i - 1` echo "The symlink depth = $i" - [ $i -eq 5 -o $i -eq 7 -o $i -eq 8 ] || error "Invalid symlink depth" + [ $i -eq 5 -o $i -eq 7 -o $i -eq 8 -o $i -eq 40 ] || + error "Invalid symlink depth" + + # Test recursive symlink + ln -s symlink_self symlink_self + $OPENFILE -f O_RDONLY symlink_self >/dev/null 2>&1; ret=$? + echo "open symlink_self returns $ret" + [ $ret -eq 40 ] || error "recursive symlink doesn't return -ELOOP" } run_test 140 "Check reasonable stack depth (shouldn't LBUG) ====" @@ -7978,7 +8228,7 @@ test_154() { echo "link new fid $fid" ln $DIR/$tfile $ffid && error "link $ffid should fail." - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir touch $DIR/$tdir/$tfile fid=$($LFS path2fid $DIR/$tdir) rc=$? @@ -8157,6 +8407,10 @@ test_156() { local AFTER local file="$DIR/$tfile" + [ "$(facet_fstype ost1)" = "zfs" ] && + skip "LU-1956/LU-2261: stats unimplemented on OSD ZFS" && + return + log "Turn on read and write cache" set_cache read on set_cache writethrough on @@ -8320,7 +8574,7 @@ test_160() { grep -q $USER || error "User $USER not found in changelog_users" # change something - mkdir -p $DIR/$tdir/pics/2008/zachy + test_mkdir -p $DIR/$tdir/pics/2008/zachy touch $DIR/$tdir/pics/2008/zachy/timestamp cp /etc/hosts $DIR/$tdir/pics/2008/zachy/pic1.jpg mv $DIR/$tdir/pics/2008/zachy $DIR/$tdir/pics/zach @@ -8334,13 +8588,13 @@ test_160() { changelog_chmask "MKDIR" changelog_chmask "CLOSE" - mkdir -p $DIR/$tdir/pics/zach/sofia + test_mkdir -p $DIR/$tdir/pics/zach/sofia echo "zzzzzz" > $DIR/$tdir/pics/zach/file changelog_chmask "MKDIR" changelog_chmask "CLOSE" - mkdir -p $DIR/$tdir/pics/2008/sofia + test_mkdir -p $DIR/$tdir/pics/2008/sofia echo "zzzzzz" > $DIR/$tdir/pics/zach/file $LFS changelog $MDT0 @@ -8401,10 +8655,10 @@ test_160() { run_test 160 "changelog sanity" test_161() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir cp /etc/hosts $DIR/$tdir/$tfile - mkdir $DIR/$tdir/foo1 - mkdir $DIR/$tdir/foo2 + test_mkdir $DIR/$tdir/foo1 + test_mkdir $DIR/$tdir/foo2 ln $DIR/$tdir/$tfile $DIR/$tdir/foo1/sofia ln $DIR/$tdir/$tfile $DIR/$tdir/foo2/zachary ln $DIR/$tdir/$tfile $DIR/$tdir/foo1/luna @@ -8461,12 +8715,12 @@ check_path() { test_162() { # Make changes to filesystem - mkdir -p $DIR/$tdir/d2 + test_mkdir -p $DIR/$tdir/d2 touch $DIR/$tdir/d2/$tfile touch $DIR/$tdir/d2/x1 touch $DIR/$tdir/d2/x2 - mkdir -p $DIR/$tdir/d2/a/b/c - mkdir -p $DIR/$tdir/d2/p/q/r + test_mkdir -p $DIR/$tdir/d2/a/b/c + test_mkdir -p $DIR/$tdir/d2/p/q/r # regular file FID=$($LFS path2fid $DIR/$tdir/d2/$tfile | tr -d '[]') check_path "$tdir/d2/$tfile" $FSNAME $FID --link 0 @@ -8690,7 +8944,7 @@ test_180b() { run_test 180b "test obdecho directly on obdfilter" test_181() { # bug 22177 - mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir" + test_mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir" # create enough files to index the directory createmany -o $DIR/$tdir/foobar 4000 # print attributes for debug purpose @@ -8734,6 +8988,27 @@ test_182() { } run_test 182 "Disable MDC RPCs semaphore wouldn't crash client ================" +test_183() { # LU-2275 + mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir" + echo aaa > $DIR/$tdir/$tfile + +#define OBD_FAIL_MDS_NEGATIVE_POSITIVE 0x148 + do_facet $SINGLEMDS $LCTL set_param fail_loc=0x148 + + ls -l $DIR/$tdir && error "ls succeeded, should have failed" + cat $DIR/$tdir/$tfile && error "cat succeeded, should have failed" + + do_facet $SINGLEMDS $LCTL set_param fail_loc=0 + + # Flush negative dentry cache + touch $DIR/$tdir/$tfile + + # We are not checking for any leaked references here, they'll + # become evident next time we do cleanup with module unload. + rm -rf $DIR/$tdir +} +run_test 183 "No crash or request leak in case of strange dispositions ========" + # OST pools tests check_file_in_pool() { @@ -9053,7 +9328,7 @@ check_default_stripe_attr() { } test_204a() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE --stripe-count 0 --stripe-size 0 --stripe-index -1 $DIR/$tdir check_default_stripe_attr --stripe-count @@ -9065,7 +9340,7 @@ test_204a() { run_test 204a "Print default stripe attributes =================" test_204b() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE --stripe-count 1 $DIR/$tdir check_default_stripe_attr --stripe-size @@ -9076,7 +9351,7 @@ test_204b() { run_test 204b "Print default stripe size and offset ===========" test_204c() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE --stripe-size 65536 $DIR/$tdir check_default_stripe_attr --stripe-count @@ -9087,7 +9362,7 @@ test_204c() { run_test 204c "Print default stripe count and offset ===========" test_204d() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE --stripe-index 0 $DIR/$tdir check_default_stripe_attr --stripe-count @@ -9098,7 +9373,7 @@ test_204d() { run_test 204d "Print default stripe count and size =============" test_204e() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE -d $DIR/$tdir check_default_stripe_attr --stripe-count --raw @@ -9110,7 +9385,7 @@ test_204e() { run_test 204e "Print raw stripe attributes =================" test_204f() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE --stripe-count 1 $DIR/$tdir check_default_stripe_attr --stripe-size --raw @@ -9121,7 +9396,7 @@ test_204f() { run_test 204f "Print raw stripe size and offset ===========" test_204g() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE --stripe-size 65536 $DIR/$tdir check_default_stripe_attr --stripe-count --raw @@ -9132,7 +9407,7 @@ test_204g() { run_test 204g "Print raw stripe count and offset ===========" test_204h() { - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE --stripe-index 0 $DIR/$tdir check_default_stripe_attr --stripe-count --raw @@ -9277,7 +9552,7 @@ test_213() { run_test 213 "OSC lock completion and cancel race don't crash - bug 18829" test_214() { # for bug 20133 - mkdir -p $DIR/d214p/d214c + test_mkdir -p $DIR/d214p/d214c for (( i=0; i < 340; i++ )) ; do touch $DIR/d214p/d214c/a$i done @@ -9507,7 +9782,7 @@ test_220() { #LU-325 remote_ost_nodsh && skip "remote OST with nodsh" && return local OSTIDX=0 - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir local OST=$(lfs osts | grep ${OSTIDX}": " | \ awk '{print $2}' | sed -e 's/_UUID$//') @@ -9571,7 +9846,7 @@ run_test 221 "make sure fault and truncate race to not cause OOM" test_222a () { rm -rf $DIR/$tdir - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE -c 1 -i 0 $DIR/$tdir createmany -o $DIR/$tdir/$tfile 10 cancel_lru_locks mdc @@ -9586,7 +9861,7 @@ run_test 222a "AGL for ls should not trigger CLIO lock failure ================" test_222b () { rm -rf $DIR/$tdir - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE -c 1 -i 0 $DIR/$tdir createmany -o $DIR/$tdir/$tfile 10 cancel_lru_locks mdc @@ -9600,7 +9875,7 @@ run_test 222b "AGL for rmdir should not trigger CLIO lock failure =============" test_223 () { rm -rf $DIR/$tdir - mkdir -p $DIR/$tdir + test_mkdir -p $DIR/$tdir $SETSTRIPE -c 1 -i 0 $DIR/$tdir createmany -o $DIR/$tdir/$tfile 10 cancel_lru_locks mdc @@ -9697,19 +9972,21 @@ mcreate_path2fid () { local rc local fid_path - $MCREATE --mode=$1 --major=$2 --minor=$3 $path || \ - error "error: cannot create $desc" + $MCREATE --mode=$1 --major=$2 --minor=$3 $path || + error "cannot create $desc" fid=$($LFS path2fid $path) rc=$? - [ $rc -ne 0 ] && error "error: cannot get fid of a $desc" + [ $rc -ne 0 ] && error "cannot get fid of a $desc" - fid_path=$($LFS fid2path $DIR $fid) + fid_path=$($LFS fid2path $DIR "$fid") rc=$? - [ $rc -ne 0 ] && error "error: cannot get path of a $desc by fid" + [ $rc -ne 0 ] && error "cannot get path of $desc by $DIR $path $fid" - [ "$path" == "$fid_path" ] || \ - error "error: fid2path returned \`$fid_path', expected \`$path'" + [ "$path" == "$fid_path" ] || + error "fid2path returned $fid_path, expected $path" + + echo "pass with $path and $fid" } test_226 () { @@ -9741,7 +10018,8 @@ run_test 227 "running truncated executable does not cause OOM" # LU-1512 try to reuse idle OI blocks test_228a() { - [ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return + [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && + skip "non-ldiskfs backend" && return local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local myDIR=$DIR/$tdir @@ -9780,7 +10058,8 @@ test_228a() { run_test 228a "try to reuse idle OI blocks" test_228b() { - [ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return + [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && + skip "non-ldiskfs backend" && return local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local myDIR=$DIR/$tdir @@ -9827,7 +10106,8 @@ run_test 228b "idle OI blocks can be reused after MDT restart" #LU-1881 test_228c() { - [ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return + [ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] && + skip "non-ldiskfs backend" && return local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/}) local myDIR=$DIR/$tdir @@ -9869,6 +10149,45 @@ test_228c() { } run_test 228c "NOT shrink the last entry in OI index node to recycle idle leaf" +test_230a() { + [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + local MDTIDX=1 + + mkdir -p $DIR/$tdir/test_230_local + local mdt_idx=$($GETSTRIPE -M $DIR/$tdir/test_230_local) + [ $mdt_idx -ne 0 ] && + error "create local directory on wrong MDT $mdt_idx" + + $LFS mkdir -i $MDTIDX $DIR/$tdir/test_230 || + error "create remote directory failed" + local mdt_idx=$($GETSTRIPE -M $DIR/$tdir/test_230) + [ $mdt_idx -ne $MDTIDX ] && + error "create remote directory on wrong MDT $mdt_idx" + + createmany -o $DIR/$tdir/test_230/t- 10 || + error "create files on remote directory failed" + mdt_idx=$($GETSTRIPE -M $DIR/$tdir/test_230/t-0) + [ $mdt_idx -ne $MDTIDX ] && error "create files on wrong MDT $mdt_idx" + rm -r $DIR/$tdir || error "unlink remote directory failed" +} +run_test 230a "Create remote directory and files under the remote directory" + +test_230b() { + [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return + local MDTIDX=1 + local remote_dir=$DIR/$tdir/remote_dir + + mkdir -p $DIR/$tdir + $LFS mkdir -i $MDTIDX $remote_dir || + error "create remote directory failed" + + $LFS mkdir -i 0 $remote_dir/new_dir && + error "nested remote directory create succeed!" + + rm -r $DIR/$tdir || error "unlink remote directory failed" +} +run_test 230b "nested remote directory should be failed" + # # tests that do cleanup/setup should be run at the end # @@ -9881,8 +10200,8 @@ test_900() { for ls in /proc/fs/lustre/ldlm/namespaces/MGC*/lru_size; do echo "clear" > $ls done - FAIL_ON_ERROR=true cleanup - FAIL_ON_ERROR=true setup + FAIL_ON_ERROR=true cleanup + FAIL_ON_ERROR=true setup } run_test 900 "umount should not race with any mgc requeue thread"