X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fruntests;h=d97bdeac330711dcddff1d9b1a81624788e0dcfd;hp=1581feddfc9e604238b92c8094a981309245605f;hb=cbd3a230274e1197d378725ee9e2aed6e35d2cb6;hpb=0c32327acfe68737f69705496c31e30eb8ae62a4 diff --git a/lustre/tests/runtests b/lustre/tests/runtests index 1581fed..d97bdea 100755 --- a/lustre/tests/runtests +++ b/lustre/tests/runtests @@ -11,13 +11,13 @@ fail() { exit $RC } -export PATH=/sbin:/usr/sbin:$SRCDIR:$PATH - -cleanup() { - $LCONF --cleanup --dump /tmp/debug $OPTS - trap 0 +log() { + echo "$*" + lctl mark "$*" } +export PATH=/sbin:/usr/sbin:$SRCDIR:$SRCDIR/../utils:$PATH + ERROR= SRC=/etc [ "$COUNT" ] || COUNT=1000 @@ -26,95 +26,108 @@ SRC=/etc [ "$MCREATE" ] || MCREATE=$SRCDIR/../tests/mcreate -OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`" -if [ -z "$OSCMT" ]; then - [ -z "$*" ] && fail "usage: $0 [--reformat] .xml" 1 - $LCONF $@ || exit 1 - trap cleanup 0 - OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`" - [ -z "$OSCMT" ] && fail "no lustre filesystem mounted" 1 -fi +[ "$MKDIRMANY" ] || MKDIRMANY=$SRCDIR/../tests/mkdirmany while [ "$1" ]; do case $1 in - -v|--verbose) V=-v;; - --reformat) : ;; - *) OPTS="$OPTS $1" ;; + *.xml) export NAME=`echo $1 | sed "s/.xml//"` ;; esac shift done -OSCTMP=`echo $OSCMT | tr "/" "."` -USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1` +MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`" +if [ -z "$MOUNT" ]; then + sh llmount.sh + MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`" + [ -z "$MOUNT" ] && fail "no lustre filesystem mounted" 1 + I_MOUNTED="yes" +fi + +OSCTMP=`echo $MOUNT | tr "/" "."` +USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1` USED=`expr $USED + 16` # Some space for the status file # let's start slowly here... -echo "touching $OSCMT" -touch $OSCMT || fail "can't touch $OSCMT" 2 -HOSTS=$OSCMT/hosts.$$ - -# this will cause the following cp to trigger bug #620096 -#echo "create an empty file $HOSTS" -#$MCREATE $HOSTS - -echo "copying /etc/hosts to $HOSTS" -cp /etc/hosts $HOSTS || fail "can't cp /etc/hosts to $HOSTS" 3 -echo "comparing /etc/hosts and $HOSTS" -diff -u /etc/hosts $HOSTS || fail "$HOSTS different" 4 -echo "renaming $HOSTS to $HOSTS.ren" -mv $HOSTS $HOSTS.ren || fail "can't rename $HOSTS to $HOSTS.ren" 5 -echo "copying /etc/hosts to $HOSTS again" -cp /etc/hosts $HOSTS || fail "can't cp /etc/hosts to $HOSTS again" 6 -echo "truncating $HOSTS" -> $HOSTS || fail "can't truncate $HOSTS" 8 -echo "removing $HOSTS" -rm $HOSTS || fail "can't remove $HOSTS" 9 - -DST=$OSCMT/runtest.$$ +log "touching $MOUNT" +touch $MOUNT || fail "can't touch $MOUNT" 2 +HOSTS=$MOUNT/hosts.$$ + +if [ $COUNT -gt 10 -o $COUNT -eq 0 ]; then + # this will cause the following cp to trigger bug #620096 + log "create an empty file $HOSTS" + mcreate $HOSTS + log "copying /etc/hosts to $HOSTS" + cp /etc/hosts $HOSTS || fail "can't cp /etc/hosts to $HOSTS" 3 + log "comparing /etc/hosts and $HOSTS" + diff -u /etc/hosts $HOSTS || fail "$HOSTS different" 4 + log "renaming $HOSTS to $HOSTS.ren" + mv $HOSTS $HOSTS.ren || fail "can't rename $HOSTS to $HOSTS.ren" 5 + log "copying /etc/hosts to $HOSTS again" + cp /etc/hosts $HOSTS || fail "can't cp /etc/hosts to $HOSTS again" 6 + log "truncating $HOSTS" + > $HOSTS || fail "can't truncate $HOSTS" 8 + log "removing $HOSTS" + rm $HOSTS || fail "can't remove $HOSTS" 9 +fi + +DST=$MOUNT/runtest.$$ # let's start slowly here... -echo "creating $DST" +log "creating $DST" mkdir $DST || fail "can't mkdir $DST" 10 -# ok, that hopefully worked, so let's do a little more -FILES=`find $SRC -type f | head -$COUNT` -echo "copying files from $SRC to $DST$SRC" +# ok, that hopefully worked, so let's do a little more, with files that +# haven't changed in the last day (hopefully they don't change during test) +FILES=`find $SRC -type f -mtime +1 -ctime +1 | head -n $COUNT` +log "copying files from $SRC to $DST$SRC" tar cf - $FILES | tar xvf - -C $DST || fail "copying $SRC" 11 -echo "comparing newly copied files" +log "comparing newly copied files" for f in $FILES; do - [ $V ] && echo "verifying $DST/$f" + [ $V ] && log "verifying $DST/$f" diff -q $f $DST/$f || ERROR=11 done [ "$ERROR" ] && fail "old and new files are different" $ERROR -$LCONF --cleanup $OPTS || exit 19 -$LCONF $OPTS || exit 20 +sh llmountcleanup.sh || exit 19 +sh llrmount.sh || exit 20 -echo "comparing previously copied files" +log "comparing previously copied files" for f in $FILES; do - [ $V ] && echo "verifying $DST/$f" + [ $V ] && log "verifying $DST/$f" diff -q $f $DST/$f || ERROR=22 done [ "$ERROR" ] && fail "old and new files are different on second diff" $ERROR -$LCONF --cleanup $OPTS || exit 29 -$LCONF $OPTS || exit 30 +sh llmountcleanup.sh || exit 19 +sh llrmount.sh || exit 20 -echo "renaming $HOSTS.ren to $HOSTS" -mv $HOSTS.ren $HOSTS || fail "can't rename $HOSTS.ren to $HOSTS" 32 -echo "truncating $HOSTS" -> $HOSTS || fail "can't truncate $HOSTS" 34 -echo "removing $HOSTS" -rm $HOSTS || fail "can't remove $HOSTS again" 36 -echo "removing $DST" +log "removing $DST" rm -r $V $DST || fail "can't remove $DST" 37 -NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1` -if [ $NOWUSED -gt $USED ]; then +if [ $COUNT -gt 10 -o $COUNT -eq 0 ]; then + log "renaming $HOSTS.ren to $HOSTS" + mv $HOSTS.ren $HOSTS || fail "can't rename $HOSTS.ren to $HOSTS" 32 + log "truncating $HOSTS" + > $HOSTS || fail "can't truncate $HOSTS" 34 + log "removing $HOSTS" + rm $HOSTS || fail "can't remove $HOSTS again" 36 +fi + +# mkdirmany test (bug 589) +log "running mkdirmany $MOUNT/base$$ 100" +$MKDIRMANY $MOUNT/base$$ 100 || fail "mkdirmany failed" +log "removing mkdirmany directories" +rmdir $MOUNT/base$$* || fail "mkdirmany cleanup failed" + +log "done" + +NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1` +if [ `expr $NOWUSED - $USED` -gt 1024 ]; then echo "Space not all freed: now ${NOWUSED}kB, was ${USED}kB." 1>&2 - echo "This is normal on BA OSTs, because of subdirectories." 1>&2 fi -cleanup $OPTS || exit 29 +if [ "$I_MOUNTED" = "yes" ]; then + sh llmountcleanup.sh || exit 29 +fi