X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Facceptance-small.sh;h=1387cf3aefc4ed926e70e456fd8d8f038dca690b;hp=0d2d836970cba6263f6e01b2cd3fcfaf043af551;hb=cbd3a230274e1197d378725ee9e2aed6e35d2cb6;hpb=067c526a4e5592095a3335478ec2580535ed2be4

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 0d2d836..1387cf3 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -3,40 +3,44 @@
 # the CVS HEAD are allowed.
 set -vxe
 
-[ "$CONFIGS" -a -z "$SANITYN" ] && SANITYN=no
+PATH=`dirname $0`/../utils:$PATH
+
 [ "$CONFIGS" ] || CONFIGS="local lov"
-[ "$MAX_THREADS" ] || MAX_THREADS=50
+[ "$MAX_THREADS" ] || MAX_THREADS=10
 if [ -z "$THREADS" ]; then
 	KB=`awk '/MemTotal:/ { print $2 }' /proc/meminfo`
 	THREADS=`expr $KB / 16384`
 	[ $THREADS -gt $MAX_THREADS ] && THREADS=$MAX_THREADS
 fi
-[ "$SIZE" ] || SIZE=20480
-[ "$RSIZE" ] || RSIZE=64
+[ "$SIZE" ] || SIZE=40960
+[ "$RSIZE" ] || RSIZE=512
 [ "$UID" ] || UID=1000
-[ "$MNT" ] || MNT=/mnt/lustre
+[ "$MOUNT" ] || MOUNT=/mnt/lustre
+[ "$MOUNT2" ] || MOUNT2=${MOUNT}2
 [ "$TMP" ] || TMP=/tmp
 [ "$COUNT" ] || COUNT=1000
-[ "$DEBUG_OFF" ] || DEBUG_OFF="eval echo 0 > /proc/sys/portals/debug"
+#[ "$DEBUG_LVL" ] || DEBUG_LVL=0x370200
+[ "$DEBUG_LVL" ] || DEBUG_LVL=0
+[ "$DEBUG_OFF" ] || DEBUG_OFF="eval echo $DEBUG_LVL > /proc/sys/portals/debug"
 [ "$DEBUG_ON" ] || DEBUG_ON="eval echo -1 > /proc/sys/portals/debug"
 
 for NAME in $CONFIGS; do
-	export NAME
+	export NAME MOUNT
 	[ -e $NAME.sh ] && sh $NAME.sh
-	[ ! -e $NAME.xml ] && [ -z "$LDAPURL" ] && echo "no config '$NAME.xml'" 1>&2 && exit 1
+	[ ! -e $NAME.xml ] && [ -z "$LDAPURL" ] && \
+		echo "no config '$NAME.xml'" 1>&2 && exit 1
 
 	if [ "$RUNTESTS" != "no" ]; then
 		sh runtests
 	fi
 
-	#[ "$SANITY" != "no" ] && sh sanity.sh
 	if [ "$SANITY" != "no" ]; then
-		START=: CLEAN=: sh sanity.sh
+		SANITYLOG=/tmp/sanity.log START=: CLEAN=: sh sanity.sh
 	fi
 
 	if [ "$DBENCH" != "no" ]; then
-		mount | grep $MNT || sh llmount.sh
-		SPACE=`df $MNT | tail -1 | awk '{ print $4 }'`
+		mount | grep $MOUNT || sh llmount.sh
+		SPACE=`df $MOUNT | tail -n 1 | awk '{ print $4 }'`
 		DB_THREADS=`expr $SPACE / 50000`
 		[ $THREADS -lt $DB_THREADS ] && DB_THREADS=$THREADS
 
@@ -52,21 +56,24 @@ for NAME in $CONFIGS; do
 			sh llmountcleanup.sh
 			sh llrmount.sh
 		fi
-		rm -f /mnt/lustre/client.txt
+		rm -f /mnt/lustre/`hostname`/client.txt
 	fi
-	chown $UID $MNT && chmod 700 $MNT
+	chown $UID $MOUNT && chmod 700 $MOUNT
 	if [ "$BONNIE" != "no" ]; then
-		mount | grep $MNT || sh llmount.sh
+		mount | grep $MOUNT || sh llmount.sh
 		$DEBUG_OFF
-		bonnie++ -s 0 -n 10 -u $UID -d $MNT
+		bonnie++ -f -r 0 -s $(($SIZE / 1024)) -n 10 -u $UID -d $MOUNT
 		$DEBUG_ON
 		sh llmountcleanup.sh
 		sh llrmount.sh
 	fi
 	IOZONE_OPTS="-i 0 -i 1 -i 2 -+d -r $RSIZE -s $SIZE"
-	IOZONE_FILE="-f $MNT/iozone"
+	if [ "$O_DIRECT" -a  "$O_DIRECT" != "no" ]; then
+	    IOZONE_OPTS="-I $IOZONE_OPTS"
+	fi
+	IOZONE_FILE="-f $MOUNT/iozone"
 	if [ "$IOZONE" != "no" ]; then
-		mount | grep $MNT || sh llmount.sh
+		mount | grep $MOUNT || sh llmount.sh
 		$DEBUG_OFF
 		iozone $IOZONE_OPTS $IOZONE_FILE
 		$DEBUG_ON
@@ -74,13 +81,13 @@ for NAME in $CONFIGS; do
 		sh llrmount.sh
 	fi
 	if [ "$IOZONE_DIR" != "no" ]; then
-		mount | grep $MNT || sh llmount.sh
-		SPACE=`df $MNT | tail -1 | awk '{ print $4 }'`
-		IOZ_THREADS=`expr $SPACE / $SIZE`
+		mount | grep $MOUNT || sh llmount.sh
+		SPACE=`df $MOUNT | tail -n 1 | awk '{ print $4 }'`
+		IOZ_THREADS=`expr $SPACE / \( $SIZE + $SIZE / 512 \)`
 		[ $THREADS -lt $IOZ_THREADS ] && IOZ_THREADS=$THREADS
 
 		$DEBUG_OFF
-		iozone -I $IOZONE_OPTS $IOZONE_FILE.odir
+		iozone $IOZONE_OPTS $IOZONE_FILE.odir
 		IOZVER=`iozone -v | awk '/Revision:/ { print $3 }' | tr -d '.'`
 		$DEBUG_ON
 		sh llmountcleanup.sh
@@ -90,10 +97,10 @@ for NAME in $CONFIGS; do
 			THREAD=1
 			IOZONE_FILE="-F "
 			while [ $THREAD -le $IOZ_THREADS ]; do
-				IOZONE_FILE="$IOZONE_FILE $MNT/iozone.$THREAD"
+				IOZONE_FILE="$IOZONE_FILE $MOUNT/iozone.$THREAD"
 				THREAD=`expr $THREAD + 1`
 			done
-			iozone -I $IOZONE_OPTS -t $IOZ_THREADS $IOZONE_FILE
+			iozone $IOZONE_OPTS -t $IOZ_THREADS $IOZONE_FILE
 			$DEBUG_ON
 			sh llmountcleanup.sh
 			sh llrmount.sh
@@ -103,19 +110,61 @@ for NAME in $CONFIGS; do
 		fi
 	fi
 	if [ "$FSX" != "no" ]; then
-		mount | grep $MNT || sh llmount.sh
+		mount | grep $MOUNT || sh llmount.sh
 		$DEBUG_OFF
-		./fsx -W -c 50 -p 1000 -P $TMP -l 1024000 -N $(($COUNT * 100)) $MNT/fsxfile
+		./fsx -W -c 50 -p 1000 -P $TMP -l $SIZE \
+			-N $(($COUNT * 100)) $MOUNT/fsxfile
 		$DEBUG_ON
 		sh llmountcleanup.sh
-		#sh llrmount.sh
+		sh llrmount.sh
 	fi	
-	mount | grep $MNT && sh llmountcleanup.sh
+	if [ "$SANITYN" != "no" ]; then
+		mount | grep $MOUNT || sh llmount.sh
+		$DEBUG_OFF
+
+		mkdir -p $MOUNT2
+		case $NAME in
+		local|lov)
+			MDSNODE=`hostname`
+			MDSNAME=mds1
+			CLIENT=client
+			;;
+		*)	# we could extract this from $NAME.xml somehow
+			;;
+		esac
+		if [ "$MDSNODE" -a "$MDSNAME" -a "$CLIENT" ]; then
+			llmount $MDSNODE:/$MDSNAME/$CLIENT $MOUNT2
+			SANITYLOG=$TMP/sanity.log START=: CLEAN=: sh sanityN.sh
+			umount $MOUNT2
+		else
+			echo "don't know \$MDSNODE, \$MDSNAME, \$CLIENT"
+			echo "can't mount2 for '$NAME', skipping sanityN.sh"
+		fi
+
+		$DEBUG_ON
+		sh llmountcleanup.sh
+		#sh llrmount.sh
+	fi
+
+	mount | grep $MOUNT && sh llmountcleanup.sh
 done
 
-if [ "$SANITYN" != "no" ]; then
-	export NAME=mount2
-	mount | grep $MNT || sh llmount.sh
-	sh sanityN.sh
-	mount | grep $MNT && sh llmountcleanup.sh
+if [ "$REPLAY_SINGLE" != "no" ]; then
+	sh replay-single.sh
+fi
+
+if [ "$CONF_SANITY" != "no" ]; then
+        sh conf-sanity.sh
+fi
+
+if [ "$RECOVERY_SMALL" != "no" ]; then
+        sh recovery-small.sh
+fi
+
+if [ "$REPLAY_OST_SINGLE" != "no" ]; then
+        sh replay-ost-single.sh
+fi
+
+if [ "$INSANITY" != "no" ]; then
+        sh insanity.sh -r
 fi