b=14330

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

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 14f9ac5..1c3194c 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -27,6 +27,11 @@ fi
 
 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
     for O in $TESTSUITE_LIST; do
        export ${O}="no"
@@ -63,6 +68,11 @@ title() {
 for NAME in $CONFIGS; do
        export NAME MOUNT START CLEAN
        . $LUSTRE/tests/cfg/$NAME.sh
+
+       if [ ! -f /lib/modules/$(uname -r)/kernel/fs/lustre/mds.ko -a \
+           ! -f `dirname $0`/../mds/mds.ko ]; then
+           export CLIENTMODSONLY=true
+       fi
        
        assert_env mds_HOST MDS_MKFS_OPTS MDSDEV
        assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
@@ -80,7 +90,7 @@ for NAME in $CONFIGS; do
 
        if [ "$SANITY" != "no" ]; then
                title sanity
-               bash sanity.sh
+               MOUNT2="" bash sanity.sh
                $CLEANUP
                $SETUP
                SANITY="done"
@@ -94,13 +104,17 @@ 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
@@ -109,20 +123,23 @@ for NAME in $CONFIGS; do
                DBENCH="done"
        fi
 
-       chown $UID $MOUNT
        which bonnie++ > /dev/null 2>&1 || BONNIE=no
        if [ "$BONNIE" != "no" ]; then
                title bonnie
-               mkdir -p $MOUNT/d0.bonnie
-               $LFS setstripe -c -1 $MOUNT/d0.bonnie
+               BONDIR=$MOUNT/d0.bonnie
+               mkdir -p $BONDIR
+               $LFS setstripe -c -1 $BONDIR
                sync
                MIN=`cat /proc/fs/lustre/osc/*/kbytesavail | sort -n | head -n1`
                SPACE=$(( OSTCOUNT * MIN ))
                [ $SPACE -lt $SIZE ] && SIZE=$((SPACE * 3 / 4))
                log "min OST has ${MIN}kB available, using ${SIZE}kB file size"
                $DEBUG_OFF
-               BONFILE=$MOUNT/d0.bonnie
-               bonnie++ -f -r 0 -s$((SIZE / 1024)) -n 10 -u$UID -d$BONFILE
+               myUID=$RUNAS_ID
+               myRUNAS=$RUNAS
+               FAIL_ON_ERROR=false check_runas_id $myUID $myRUNAS || { myRUNAS="" && myUID=$UID; }
+               chown $myUID:$myUID $BONDIR             
+               $myRUNAS bonnie++ -f -r 0 -s$((SIZE / 1024)) -n 10 -u$myUID:$myUID -d$BONDIR
                $DEBUG_ON
                $CLEANUP
                $SETUP
@@ -244,7 +261,12 @@ for NAME in $CONFIGS; do
                [ -f /etc/modprobe.conf ] && MODPROBECONF=/etc/modprobe.conf
                [ -f /etc/modprobe.d/Lustre ] && MODPROBECONF=/etc/modprobe.d/Lustre
 
-               LNETOPTS="$(awk '/^options lnet/ { print $0}' $MODPROBECONF | sed 's/^options lnet //g') accept=all" MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl" $SETUP
+               LNETOPTS="$(awk '/^options lnet/ { print $0}' $MODPROBECONF | \
+                       sed 's/^options lnet //g') accept=all" \
+                       MDS_MOUNT_OPTS=$(echo $MDS_MOUNT_OPTS | sed 's/^[ \t]*//;s/[ \t]*$//') \
+                       MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl" \
+                       MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS/#,/-o } \
+                       $SETUP
                export LIBLUSTRE_MOUNT_POINT=$MOUNT2
                export LIBLUSTRE_MOUNT_TARGET=$MGSNID:/$FSNAME
                export LIBLUSTRE_TIMEOUT=`cat /proc/sys/lustre/timeout`