merge b_devel into HEAD. Includes:

[fs/lustre-release.git] / lustre / tests / runregression-mds.sh

diff --git a/lustre/tests/runregression-mds.sh b/lustre/tests/runregression-mds.sh
index 4a60a54..ecfe0d9 100755 (executable)
--- a/lustre/tests/runregression-mds.sh
+++ b/lustre/tests/runregression-mds.sh
@@ -31,9 +31,10 @@ if [ -z "$OSCMT" ]; then
        [ -z "$OSCMT" ] && fail "no lustre filesystem mounted" 1
 fi
 
+V="-10"
 while [ "$1" ]; do
        case $1 in
-       -v|--verbose) V=-v;;
+       -v|--verbose) V="1";;
        --reformat) : ;;
        *) OPTS="$OPTS $1" ;;
        esac
@@ -45,11 +46,12 @@ USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
 USED=`expr $USED + 16` # Some space for the status file
 
 THREADS=1
-while [ ! -f $ENDRUN ]; do
+while [ $THREADS -lt 196 ]; do
        echo "starting $THREADS threads at `date`"
-       echo 0 > /proc/sys/portals/debug
-       $SRCDIR/createdestroy /mnt/lustre/file-$$ $COUNT -10 $THREADS
-       THREADS=`expr $THREADS + 1`
+       [ $V -gt 0 ] || echo 0 > /proc/sys/portals/debug
+       $SRCDIR/createdestroy /mnt/lustre/file-$$ $COUNT $V $THREADS
+       $SRCDIR/openclose /mnt/lustre/file-$$ $COUNT $THREADS
+       THREADS=`expr $THREADS + 5`
        $LCONF --cleanup $OPTS || fail 10
        $LCONF $OPTS || fail 11
 done