X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Facceptance-small.sh;h=e43528c01a605b66ea509f20e5ae65ea679617bd;hb=a64f43dfeb7b30b5f94cee813f57845c76feeeac;hp=5b8161143d95495122fe285811a2b10d7cfb83b4;hpb=0ecb04aa438c2ec57c606a6d0f4bad13b57ccba5;p=fs%2Flustre-release.git

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 5b81611..e43528c 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -1,83 +1,269 @@
-#!/bin/sh
+#!/bin/bash
 # script which _must_ complete successfully (at minimum) before checkins to
 # the CVS HEAD are allowed.
-set -vxe
+#set -vx
+set -e
 
-[ "$CONFIGS" ] || CONFIGS="local lov"
-[ "$THREADS" ] || THREADS=1
-[ "$SIZE" ] || SIZE=20480
-[ "$RSIZE" ] || RSIZE=64
+PATH=`dirname $0`/../utils:$PATH
+
+[ "$CONFIGS" ] || CONFIGS="local"  #"local lov"
+[ "$MAX_THREADS" ] || MAX_THREADS=20
+RAMKB=`awk '/MemTotal:/ { print $2 }' /proc/meminfo`
+if [ -z "$THREADS" ]; then
+	THREADS=$((RAMKB / 16384))
+	[ $THREADS -gt $MAX_THREADS ] && THREADS=$MAX_THREADS
+fi
+[ "$SIZE" ] || SIZE=$((RAMKB * 2))
+[ "$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=0
+[ "$DEBUG_OFF" ] || DEBUG_OFF="eval sysctl -w lnet.debug=\"$DEBUG_LVL\""
+[ "$DEBUG_ON" ] || DEBUG_ON="eval sysctl -w lnet.debug=0x33f0484"
+
+
+LIBLUSTRE=${LIBLUSTRE:-../liblustre}
+LIBLUSTRETESTS=${LIBLUSTRETESTS:-$LIBLUSTRE/tests}
+
+STARTTIME=`date +%s`
+RANTEST=""
+
+LUSTRE=${LUSTRE:-`dirname $0`/..}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+
+SETUP=${SETUP:-setupall}
+FORMAT=${FORMAT:-formatall}
+CLEANUP=${CLEANUP:-stopall}
+
+setup_if_needed() {
+    mount | grep $MOUNT && return
+    $FORMAT && $SETUP
+}
+
+title() {
+    echo "-----============= acceptance-small: "$*" ============-----"
+    RANTEST=${RANTEST}$*", "
+}
 
 for NAME in $CONFIGS; do
-	export NAME
-	[ -e $NAME.sh ] && sh $NAME.sh
-	[ ! -e $NAME.xml ] && echo "no config '$NAME.xml'" 1>&2 && exit 1
+	export NAME MOUNT START CLEAN
+	. $LUSTRE/tests/cfg/$NAME.sh
+	
+	assert_env mds_HOST MDS_MKFS_OPTS MDSDEV
+	assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
+	assert_env FSNAME MOUNT MOUNT2
+
+	setup_if_needed
 
 	if [ "$RUNTESTS" != "no" ]; then
+	        title runtests
 		sh runtests
+		$CLEANUP
+		$SETUP
 	fi
 
-	mount | grep $MNT || sh llmount.sh
-	[ "$SANITY" != "no" ] && sh sanity.sh
+	if [ "$SANITY" != "no" ]; then
+	        title sanity
+		SANITYLOG=/tmp/sanity.log sh sanity.sh
+		$CLEANUP
+		$SETUP
+	fi
+
+	which dbench > /dev/null 2>&1 || DBENCH=no
 	if [ "$DBENCH" != "no" ]; then
+	        title dbench
+		SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
+		DB_THREADS=$((SPACE / 50000))
+		[ $THREADS -lt $DB_THREADS ] && DB_THREADS=$THREADS
+
 		$DEBUG_OFF
 		sh rundbench 1
-		sh llmountcleanup.sh
-		sh llrmount.sh
-		if [ $THREADS -gt 1 ]; then
-			sh rundbench $THREADS
-			sh llmountcleanup.sh
-			sh llrmount.sh
+		$DEBUG_ON
+		$CLEANUP
+		$SETUP
+		if [ $DB_THREADS -gt 1 ]; then
+			$DEBUG_OFF
+			sh rundbench $DB_THREADS
+			$DEBUG_ON
+			$CLEANUP
+			$SETUP
 		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
+	which bonnie++ > /dev/null 2>&1 || BONNIE=no
 	if [ "$BONNIE" != "no" ]; then
+	        title bonnie
+		SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
+		[ $SPACE -lt $SIZE ] && SIZE=$((SPACE * 3 / 4))
 		$DEBUG_OFF
-		bonnie++ -s 0 -n 10 -u $UID -d $MNT
-		sh llmountcleanup.sh
-		sh llrmount.sh
+		bonnie++ -f -r 0 -s $((SIZE / 1024)) -n 10 -u $UID -d $MOUNT
+		$DEBUG_ON
+		$CLEANUP
+		$SETUP
 	fi
-	IOZONE_OPTS="-i 0 -i 1 -i 2 -+d -r $RSIZE -s $SIZE"
-	IOZONE_FILE="-f $MNT/iozone"
+
+	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 }'`
+		[ $SPACE -lt $SIZE ] && SIZE=$((SPACE * 3 / 4))
+		IOZONE_OPTS="-i 0 -i 1 -i 2 -e -+d -r $RSIZE -s $SIZE"
+		IOZFILE="-f $MOUNT/iozone"
 		$DEBUG_OFF
-		iozone $IOZONE_OPTS $IOZONE_FILE
-		sh llmountcleanup.sh
-		sh llrmount.sh
-	fi
-	if [ "$IOZONE_DIR" != "no" ]; then
-		$DEBUG_OFF
-		iozone -I $IOZONE_OPTS $IOZONE_FILE.odir
-		IOZVER=`iozone -v | awk '/Revision:/ { print $3 }' | tr -d '.'`
-		sh llmountcleanup.sh
-		sh llrmount.sh
-		if [ "$THREADS" -gt 1 -a "$IOZVER" -ge 3145 ]; then
+		iozone $IOZONE_OPTS $IOZFILE
+		$DEBUG_ON
+		$CLEANUP
+		$SETUP
+
+		# check if O_DIRECT support is implemented in kernel
+		if [ -z "$O_DIRECT" ]; then
+			touch $MOUNT/f.iozone
+			if ! ./directio write $MOUNT/f.iozone 0 1; then
+				O_DIRECT=no
+			fi
+			rm -f $MOUNT/f.iozone
+		fi
+		if [ "$O_DIRECT" != "no" -a "$IOZONE_DIR" != "no" ]; then
+			$DEBUG_OFF
+			iozone -I $IOZONE_OPTS $IOZFILE.odir
+			$DEBUG_ON
+			$CLEANUP
+			$SETUP
+		fi
+
+		SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
+		IOZ_THREADS=$((SPACE / SIZE * 2 / 3 ))
+		[ $THREADS -lt $IOZ_THREADS ] && IOZ_THREADS=$THREADS
+		IOZVER=`iozone -v | awk '/Revision:/ {print $3}' | tr -d .`
+		if [ "$IOZ_THREADS" -gt 1 -a "$IOZVER" -ge 3145 ]; then
 			$DEBUG_OFF
 			THREAD=1
-			IOZONE_FILE="-F "
-			SIZE=`expr $SIZE / $THREADS`
-			while [ $THREAD -le $THREADS ]; do
-				IOZONE_FILE="$IOZONE_FILE $MNT/iozone.$THREAD"
-				THREAD=`expr $THREAD + 1`
+			IOZFILE="-F "
+			while [ $THREAD -le $IOZ_THREADS ]; do
+				IOZFILE="$IOZFILE $MOUNT/iozone.$THREAD"
+				THREAD=$((THREAD + 1))
 			done
-			iozone -I $IOZONE_OPTS -t $THREADS $IOZONE_FILE
-			sh llmountcleanup.sh
-			sh llrmount.sh
+			iozone $IOZONE_OPTS -t $IOZ_THREADS $IOZFILE
+			$DEBUG_ON
+			$CLEANUP
+			$SETUP
 		elif [ $IOZVER -lt 3145 ]; then
 			VER=`iozone -v | awk '/Revision:/ { print $3 }'`
-			echo "iozone $VER too old for multi-threaded tests"
+			echo "iozone $VER too old for multi-thread test"
 		fi
 	fi
+
 	if [ "$FSX" != "no" ]; then
+	        title fsx
+		SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
+		[ $SPACE -lt $SIZE ] && SIZE=$((SPACE * 3 / 4))
 		$DEBUG_OFF
-		./fsx -c 50 -p 1000 -l 1024000 -N $(($COUNT * 100)) $MNT/fsxfile
-		sh llmountcleanup.sh
-		#sh llrmount.sh
+		./fsx -c 50 -p 1000 -P $TMP -l $SIZE \
+			-N $(($COUNT * 100)) $MOUNT/fsxfile
+		$DEBUG_ON
+		$CLEANUP
+		$SETUP
 	fi	
-	mount | grep $MNT && sh llmountcleanup.sh
+
+	if [ "$SANITYN" != "no" ]; then
+	        title sanityN
+		$DEBUG_OFF
+
+		mkdir -p $MOUNT2
+		mount_client $MOUNT2
+		#echo "can't mount2 for '$NAME', skipping sanityN.sh"
+		SANITYLOG=$TMP/sanity.log START=: CLEAN=: sh sanityN.sh
+		umount $MOUNT2
+
+		$DEBUG_ON
+		$CLEANUP
+		$SETUP
+	fi
+
+	if [ "$LFSCK" != "no" -a -x /usr/sbin/lfsck ]; then
+	        title lfsck
+		E2VER=`e2fsck -V 2>&1 | head -n 1 | cut -d' ' -f 2`
+		if grep -q obdfilter /proc/fs/lustre/devices; then
+			if [ `echo $E2VER | cut -d. -f2` -ge 39 ] && \
+			   [ "`echo $E2VER | grep cfs`" ]; then
+			   	sh lfscktest.sh
+			else
+				e2fsck -V
+				echo "e2fsck does not support lfsck, skipping"
+			fi
+		else
+			echo "remote OST, skipping test"
+		fi
+	fi
+
+	if [ "$LIBLUSTRE" != "no" ]; then
+	        title liblustre
+		assert_env MGSNID MOUNT2
+		$CLEANUP
+		unload_modules
+		# Liblustre needs accept=all, noacl
+		LNETOPTS="accept=all" MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl" $SETUP
+		export LIBLUSTRE_MOUNT_POINT=$MOUNT2
+		export LIBLUSTRE_MOUNT_TARGET=$MGSNID:/$FSNAME
+		export LIBLUSTRE_TIMEOUT=`cat /proc/sys/lustre/timeout`
+		#export LIBLUSTRE_DEBUG_MASK=`cat /proc/sys/lnet/debug`
+		if [ -x $LIBLUSTRETESTS/sanity ]; then
+			mkdir -p $MOUNT2
+			$LIBLUSTRETESTS/sanity --target=$LIBLUSTRE_MOUNT_TARGET
+		fi
+		$CLEANUP
+		#$SETUP
+	fi
+
+	$CLEANUP
 done
+
+if [ "$REPLAY_SINGLE" != "no" ]; then
+        title replay-single
+	sh replay-single.sh
+fi
+
+if [ "$CONF_SANITY" != "no" ]; then
+        title conf-sanity
+        sh conf-sanity.sh
+fi
+
+if [ "$RECOVERY_SMALL" != "no" ]; then
+        title recovery-small
+        sh recovery-small.sh
+fi
+
+if [ "$REPLAY_OST_SINGLE" != "no" ]; then
+        title replay-ost-single
+        sh replay-ost-single.sh
+fi
+
+if [ "$REPLAY_DUAL" != "no" ]; then
+        title replay-dual
+        sh replay-dual.sh
+fi
+
+if [ "$INSANITY" != "no" ]; then
+        title insanity
+        sh insanity.sh -r
+fi
+
+if [ "$SANITY_QUOTA" != "no" ]; then
+        title sanity-quota
+        sh sanity-quota.sh
+fi
+
+
+RC=$?
+title FINISHED
+echo "Finished at `date` in $((`date +%s` - $STARTTIME))s"
+echo "Tests ran: $RANTEST"
+
+echo "$0: completed with rc $RC" && exit $RC