b=14148

[fs/lustre-release.git] / lustre / tests / acceptance-small.sh

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 8d25297..5570704 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -25,13 +25,23 @@ fi
 [ "$DEBUG_OFF" ] || DEBUG_OFF="eval sysctl -w lnet.debug=\"$DEBUG_LVL\""
 [ "$DEBUG_ON" ] || DEBUG_ON="eval sysctl -w lnet.debug=0x33f0484"
 
+export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL INSANITY SANITY_QUOTA"
+
+if [ "$SLOW" = "no" ]; then
+#          5 min  
+    export IOZONE="no"
+fi
+
 if [ "$ACC_SM_ONLY" ]; then
-    export RUNTESTS="no" SANITY="no" DBENCH="no" BONNIE="no" IOZONE="no" FSX="no" SANITYN="no" LFSCK="no" LIBLUSTRE="no" REPLAY_SINGLE="no" CONF_SANITY="no" RECOVERY_SMALL="no" REPLAY_OST_SINGLE="no" REPLAY_DUAL="no" INSANITY="no" SANITY_QUOTA="no"
+    for O in $TESTSUITE_LIST; do
+       export ${O}="no"
+    done
     for O in $ACC_SM_ONLY; do
        O=`echo $O | tr "[:lower:]" "[:upper:]"`
        export ${O}="yes"
     done
 fi
+LFSCK="no" # bug 13698
 
 LIBLUSTRETESTS=${LIBLUSTRETESTS:-../liblustre/tests}
 
@@ -52,8 +62,7 @@ setup_if_needed() {
 }
 
 title() {
-    echo "-----============= acceptance-small: "$*" ============-----"
-    $LCTL mark "----===== $* =====----" 2> /dev/null || true
+    log "-----============= acceptance-small: "$*" ============----- `date`"
     RANTEST=${RANTEST}$*", "
 }
 
@@ -72,6 +81,7 @@ for NAME in $CONFIGS; do
                bash runtests
                $CLEANUP
                $SETUP
+               RUNTESTS="done"
        fi
 
        if [ "$SANITY" != "no" ]; then
@@ -79,6 +89,7 @@ for NAME in $CONFIGS; do
                bash sanity.sh
                $CLEANUP
                $SETUP
+               SANITY="done"
        fi
 
        which dbench > /dev/null 2>&1 || DBENCH=no
@@ -89,38 +100,47 @@ for NAME in $CONFIGS; do
                [ $THREADS -lt $DB_THREADS ] && DB_THREADS=$THREADS
 
                $DEBUG_OFF
-               bash rundbench 1
-               $DEBUG_ON
-               $CLEANUP
-               $SETUP
+               duration=""
+               [ "$SLOW" = "no" ] && duration=" -t 120"
+               if [ "$SLOW" != "no" -o $DB_THREADS -eq 1 ]; then
+                       bash rundbench 1 $duration
+                       $DEBUG_ON
+                       $CLEANUP
+                       $SETUP
+               fi
                if [ $DB_THREADS -gt 1 ]; then
                        $DEBUG_OFF
-                       bash rundbench $DB_THREADS
+                       bash rundbench $DB_THREADS $duration
                        $DEBUG_ON
                        $CLEANUP
                        $SETUP
                fi
                rm -f /mnt/lustre/`hostname`/client.txt
+               DBENCH="done"
        fi
 
-       chown $UID $MOUNT && chmod 700 $MOUNT
+       chown $UID $MOUNT
        which bonnie++ > /dev/null 2>&1 || BONNIE=no
        if [ "$BONNIE" != "no" ]; then
                title bonnie
-               SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
+               $LFS setstripe $MOUNT 0 -1 -1
+               MIN=`cat /proc/fs/lustre/osc/*-osc-*/kbytesfree | sort -n | head -n1`
+               SPACE=$(( OSTCOUNT * MIN ))
                [ $SPACE -lt $SIZE ] && SIZE=$((SPACE * 3 / 4))
                $DEBUG_OFF
                bonnie++ -f -r 0 -s $((SIZE / 1024)) -n 10 -u $UID -d $MOUNT
                $DEBUG_ON
                $CLEANUP
                $SETUP
+               BONNIE="done"
        fi
 
        export O_DIRECT
        which iozone > /dev/null 2>&1 || IOZONE=no
        if [ "$IOZONE" != "no" ]; then
                title iozone
-               SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
+               MIN=`cat /proc/fs/lustre/osc/*-osc-*/kbytesfree | sort -n | head -n1`
+               SPACE=$(( OSTCOUNT * MIN ))
                [ $SPACE -lt $SIZE ] && SIZE=$((SPACE * 3 / 4))
                IOZONE_OPTS="-i 0 -i 1 -i 2 -e -+d -r $RSIZE -s $SIZE"
                IOZFILE="$MOUNT/iozone"
@@ -168,6 +188,7 @@ for NAME in $CONFIGS; do
                        VER=`iozone -v | awk '/Revision:/ { print $3 }'`
                        echo "iozone $VER too old for multi-thread test"
                fi
+               IOZONE="done"
        fi
 
        if [ "$FSX" != "no" ]; then
@@ -180,6 +201,7 @@ for NAME in $CONFIGS; do
                $DEBUG_ON
                $CLEANUP
                $SETUP
+               FSX="done"
        fi      
 
        if [ "$SANITYN" != "no" ]; then
@@ -195,6 +217,7 @@ for NAME in $CONFIGS; do
                $DEBUG_ON
                $CLEANUP
                $SETUP
+               SANITYN="done"
        fi
 
        if [ "$LFSCK" != "no" -a -x /usr/sbin/lfsck ]; then
@@ -211,6 +234,7 @@ for NAME in $CONFIGS; do
                else
                        echo "remote OST, skipping test"
                fi
+               LFSCK="done"
        fi
 
        if [ "$LIBLUSTRE" != "no" ]; then
@@ -234,6 +258,7 @@ for NAME in $CONFIGS; do
                fi
                $CLEANUP
                #$SETUP
+               LIBLUSTRE="done"
        fi
 
        $CLEANUP
@@ -242,36 +267,43 @@ done
 if [ "$REPLAY_SINGLE" != "no" ]; then
         title replay-single
        bash replay-single.sh
+       REPLAY_SINGLE="done"
 fi
 
 if [ "$CONF_SANITY" != "no" ]; then
         title conf-sanity
         bash conf-sanity.sh
+        CONF_SANITY="done"
 fi
 
 if [ "$RECOVERY_SMALL" != "no" ]; then
         title recovery-small
         bash recovery-small.sh
+        RECOVERY_SMALL="done"
 fi
 
 if [ "$REPLAY_OST_SINGLE" != "no" ]; then
         title replay-ost-single
         bash replay-ost-single.sh
+        REPLAY_OST_SINGLE="done"
 fi
 
 if [ "$REPLAY_DUAL" != "no" ]; then
         title replay-dual
         bash replay-dual.sh
+        REPLAY_DUAL="done"
 fi
 
 if [ "$INSANITY" != "no" ]; then
         title insanity
         bash insanity.sh -r
+        INSANITY="done"
 fi
 
 if [ "$SANITY_QUOTA" != "no" ]; then
         title sanity-quota
         bash sanity-quota.sh
+        SANITY_QUOTA="done"
 fi
 
 
@@ -279,5 +311,5 @@ RC=$?
 title FINISHED
 echo "Finished at `date` in $((`date +%s` - $STARTTIME))s"
 echo "Tests ran: $RANTEST"
-
+print_summary
 echo "$0: completed with rc $RC" && exit $RC