Update b_orphan from HEAD (20040130_1601)

[fs/lustre-release.git] / lustre / tests / sanityN.sh

diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index b3173e9..05da911 100644 (file)
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -3,7 +3,11 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"8"} # bug 1557
+# bug number for skipped test: 1557 2366
+ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"8   10   "}
+# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
+
+[ "$ALWAYS_EXCEPT$EXCEPT" ] && echo "Skipping tests: $ALWAYS_EXCEPT $EXCEPT"
 
 SRCDIR=`dirname $0`
 PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$PATH
@@ -54,7 +58,9 @@ run_one() {
                $START
        fi
        log "== test $1: $2"
-       test_$1 || error "test_$1: $?"
+       export TESTNAME=test_$1
+       test_$1 || error "test_$1: exit with rc=$?"
+       unset TESTNAME
        pass
        cd $SAVE_PWD
        $CLEAN
@@ -82,24 +88,30 @@ run_test() {
        fi
 }
 
+[ "$SANITYLOG" ] && rm -f $SANITYLOG || true
+
 error () {
        log "FAIL: $@"
-       exit 1
+       if [ "$SANITYLOG" ]; then
+               echo "FAIL: $TESTNAME $@" >> $SANITYLOG
+       else
+               exit 1
+       fi
 }
 
 pass() {
        echo PASS
 }
 
-MOUNT1=`mount| awk '/^'$NAME' .* lustre_lite / { print $3 }'| head -1`
-MOUNT2=`mount| awk '/^'$NAME' .* lustre_lite / { print $3 }'| tail -1`
+export MOUNT1=`mount| awk '/ lustre/ { print $3 }'| head -1`
+export MOUNT2=`mount| awk '/ lustre/ { print $3 }'| tail -1`
 [ -z "$MOUNT1" ] && error "NAME=$NAME not mounted once"
 [ "$MOUNT1" = "$MOUNT2" ] && error "NAME=$NAME not mounted twice"
-[ `mount| awk '/^'$NAME' .* lustre_lite / { print $3 }'| wc -l` -ne 2 ] && \
+[ `mount| awk '/ lustre/ { print $3 }'| wc -l` -ne 2 ] && \
        error "NAME=$NAME mounted more than twice"
 
-DIR1=${DIR1:-$MOUNT1}
-DIR2=${DIR2:-$MOUNT2}
+export DIR1=${DIR1:-$MOUNT1}
+export DIR2=${DIR2:-$MOUNT2}
 [ -z "`echo $DIR1 | grep $MOUNT1`" ] && echo "$DIR1 not in $MOUNT1" && exit 96
 [ -z "`echo $DIR2 | grep $MOUNT2`" ] && echo "$DIR2 not in $MOUNT2" && exit 95
 
@@ -173,6 +185,7 @@ run_test 4 "fstat validation on multiple mount points =========="
 test_5() {
        mcreate $DIR1/f5
        truncate $DIR2/f5 100
+       $CHECKSTAT -t file -s 100 $DIR1/f5 || error
        rm $DIR1/f5
 }
 run_test 5 "create a file on one mount, truncate it on the other"
@@ -200,7 +213,8 @@ test_9() {
                echo -n $C >> $DIR/f9
                [ "$MTPT" -eq 1 ] && MTPT=2 || MTPT=1
        done
-       [ "`cat $DIR1/f9`" = "abcdefghijkl" ] || error
+       [ "`cat $DIR1/f9`" = "abcdefghijkl" ] || \
+               error "`od -a $DIR1/f10` != abcdefghijkl"
 }
 run_test 9 "append of file with sub-page size on multiple mounts"
 
@@ -214,7 +228,8 @@ test_10() {
                [ "$MTPT" -eq 1 ] && MTPT=2 || MTPT=1
                OFFSET=`expr $OFFSET + 1`
        done
-       [ "`cat $DIR1/f10`" = "abcdefghijkl" ] || error
+       [ "`cat $DIR1/f10`" = "abcdefghijkl" ] || \
+               error "`od -a $DIR1/f10` != abcdefghijkl"
 }
 run_test 10 "write of file with sub-page size on multiple mounts "
 
@@ -222,6 +237,7 @@ test_11() {
        mkdir $DIR1/d11
        multiop $DIR1/d11/f O_c &
        MULTIPID=$!
+       usleep 200
        cp -p /bin/ls $DIR1/d11/f
        $DIR2/d11/f
        RC=$?
@@ -236,6 +252,24 @@ test_12() {
 }
 run_test 12 "test lock ordering (link, stat, unlink) ==========="
 
+test_13() {    # bug 2451 - directory coherency
+       rm -rf $DIR1/d13
+       mkdir $DIR1/d13 || error
+       cd $DIR1/d13 || error
+       ls
+       ( touch $DIR1/d13/f13 ) # needs to be a separate shell
+       ls
+       rm -f $DIR2/d13/f13 || error
+       ls 2>&1 | grep f13 && error "f13 shouldn't return an error (1)" || true
+       # need to run it twice
+       ( touch $DIR1/d13/f13 ) # needs to be a separate shell
+       ls
+       rm -f $DIR2/d13/f13 || error
+       ls 2>&1 | grep f13 && error "f13 shouldn't return an error (2)" || true
+}
+run_test 13 "test directory page revocation ===================="
+
 log "cleanup: ======================================================"
 rm -rf $DIR1/[df][0-9]* $DIR1/lnk || true
 echo '=========================== finished ==============================='
+[ -f "$SANITYLOG" ] && cat $SANITYLOG && exit 1 || true