X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Facceptance-small.sh;h=517aa66d51d0146cb4ec604f095478a5efcb3d15;hp=31bb8adbb023bb6cc60371f814bacb7c7df6c1e0;hb=8cbfeb03c00b1b570ce99d52b406737ef51eb64e;hpb=164bf598e3e4f738cb31e8422904de6dc614a2f0

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 31bb8ad..517aa66 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -1,158 +1,306 @@
-#!/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
 
 PATH=`dirname $0`/../utils:$PATH
 
-[ "$CONFIGS" ] || CONFIGS="local lov"
-[ "$MAX_THREADS" ] || MAX_THREADS=10
+[ -z "$CONFIG" -a "$NAME" ] && CONFIGS=$NAME
+[ "$CONFIGS" ] || CONFIGS="local"  #"local lov"
+[ "$MAX_THREADS" ] || MAX_THREADS=20
+RAMKB=`awk '/MemTotal:/ { print $2 }' /proc/meminfo`
 if [ -z "$THREADS" ]; then
-	KB=`awk '/MemTotal:/ { print $2 }' /proc/meminfo`
-	THREADS=`expr $KB / 16384`
+	THREADS=$((RAMKB / 16384))
 	[ $THREADS -gt $MAX_THREADS ] && THREADS=$MAX_THREADS
 fi
-[ "$SIZE" ] || SIZE=40960
+[ "$SIZE" ] || SIZE=$((RAMKB * 2))
 [ "$RSIZE" ] || RSIZE=512
 [ "$UID" ] || UID=1000
 [ "$MOUNT" ] || MOUNT=/mnt/lustre
 [ "$MOUNT2" ] || MOUNT2=${MOUNT}2
 [ "$TMP" ] || TMP=/tmp
 [ "$COUNT" ] || COUNT=1000
-#[ "$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"
+[ "$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 [ "$ACC_SM_ONLY" ]; then
+    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}
+
+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() {
+    log "-----============= acceptance-small: "$*" ============----- `date`"
+    RANTEST=${RANTEST}$*", "
+}
 
 for NAME in $CONFIGS; do
-	export NAME MOUNT
-	[ -e $NAME.sh ] && sh $NAME.sh
-	[ ! -e $NAME.xml ] && [ -z "$LDAPURL" ] && \
-		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
-		sh runtests
+	        title runtests
+		bash runtests
+		$CLEANUP
+		$SETUP
+		RUNTESTS="done"
 	fi
 
 	if [ "$SANITY" != "no" ]; then
-		SANITYLOG=/tmp/sanity.log START=: CLEAN=: sh sanity.sh
+	        title sanity
+		bash sanity.sh
+		$CLEANUP
+		$SETUP
+		SANITY="done"
 	fi
 
+	which dbench > /dev/null 2>&1 || DBENCH=no
 	if [ "$DBENCH" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
-		SPACE=`df $MOUNT | tail -1 | awk '{ print $4 }'`
-		DB_THREADS=`expr $SPACE / 50000`
+	        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
+		bash rundbench 1
 		$DEBUG_ON
-		sh llmountcleanup.sh
-		sh llrmount.sh
+		$CLEANUP
+		$SETUP
 		if [ $DB_THREADS -gt 1 ]; then
 			$DEBUG_OFF
-			sh rundbench $DB_THREADS
+			bash rundbench $DB_THREADS
 			$DEBUG_ON
-			sh llmountcleanup.sh
-			sh llrmount.sh
+			$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
-		mount | grep $MOUNT || sh llmount.sh
+	        title bonnie
+		$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
+		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"
-	if [ "$O_DIRECT" -a  "$O_DIRECT" != "no" ]; then
-	    IOZONE_OPTS="-I $IOZONE_OPTS"
+		$CLEANUP
+		$SETUP
+		BONNIE="done"
 	fi
-	IOZONE_FILE="-f $MOUNT/iozone"
+
+	export O_DIRECT
+	which iozone > /dev/null 2>&1 || IOZONE=no
 	if [ "$IOZONE" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
+	        title iozone
+		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"
+		# $SPACE was calculated with all OSTs
+		$LFS setstripe $IOZFILE 0 -1 -1
 		$DEBUG_OFF
-		iozone $IOZONE_OPTS $IOZONE_FILE
+		iozone $IOZONE_OPTS -f $IOZFILE
 		$DEBUG_ON
-		sh llmountcleanup.sh
-		sh llrmount.sh
-	fi
-	if [ "$IOZONE_DIR" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
-		SPACE=`df $MOUNT | tail -1 | awk '{ print $4 }'`
-		IOZ_THREADS=`expr $SPACE / \( $SIZE + $SIZE / 512 \)`
-		[ $THREADS -lt $IOZ_THREADS ] && IOZ_THREADS=$THREADS
+		$CLEANUP
+		$SETUP
 
-		$DEBUG_OFF
-		iozone $IOZONE_OPTS $IOZONE_FILE.odir
-		IOZVER=`iozone -v | awk '/Revision:/ { print $3 }' | tr -d '.'`
-		$DEBUG_ON
-		sh llmountcleanup.sh
-		sh llrmount.sh
+		# 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 "
+			IOZFILE="-F "
 			while [ $THREAD -le $IOZ_THREADS ]; do
-				IOZONE_FILE="$IOZONE_FILE $MOUNT/iozone.$THREAD"
-				THREAD=`expr $THREAD + 1`
+				IOZFILE="$IOZFILE $MOUNT/iozone.$THREAD"
+				THREAD=$((THREAD + 1))
 			done
-			iozone $IOZONE_OPTS -t $IOZ_THREADS $IOZONE_FILE
+			iozone $IOZONE_OPTS -t $IOZ_THREADS $IOZFILE
 			$DEBUG_ON
-			sh llmountcleanup.sh
-			sh llrmount.sh
+			$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
+		IOZONE="done"
 	fi
+
 	if [ "$FSX" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
+	        title fsx
+		SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
+		[ $SPACE -lt $SIZE ] && SIZE=$((SPACE * 3 / 4))
 		$DEBUG_OFF
-		./fsx -W -c 50 -p 1000 -P $TMP -l $SIZE \
+		./fsx -c 50 -p 1000 -P $TMP -l $SIZE \
 			-N $(($COUNT * 100)) $MOUNT/fsxfile
 		$DEBUG_ON
-		sh llmountcleanup.sh
-		sh llrmount.sh
+		$CLEANUP
+		$SETUP
+		FSX="done"
 	fi	
+
 	if [ "$SANITYN" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
+	        title sanityN
 		$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
+		mount_client $MOUNT2
+		#echo "can't mount2 for '$NAME', skipping sanityN.sh"
+		START=: CLEAN=: bash sanityN.sh
+		umount $MOUNT2
+
+		$DEBUG_ON
+		$CLEANUP
+		$SETUP
+		SANITYN="done"
+	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
+			   	bash lfscktest.sh
+			else
+				e2fsck -V
+				echo "e2fsck does not support lfsck, skipping"
+			fi
 		else
-			echo "don't know \$MDSNODE, \$MDSNAME, \$CLIENT"
-			echo "can't mount2 for '$NAME', skipping sanityN.sh"
+			echo "remote OST, skipping test"
 		fi
+		LFSCK="done"
+	fi
 
-		$DEBUG_ON
-		sh llmountcleanup.sh
-		#sh llrmount.sh
+	if [ "$LIBLUSTRE" != "no" ]; then
+	        title liblustre
+		assert_env MGSNID MOUNT2
+		$CLEANUP
+		unload_modules
+		# Liblustre needs accept=all, noacl
+		[ -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
+		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
+			echo $LIBLUSTRETESTS/sanity --target=$LIBLUSTRE_MOUNT_TARGET
+			$LIBLUSTRETESTS/sanity --target=$LIBLUSTRE_MOUNT_TARGET
+		fi
+		$CLEANUP
+		#$SETUP
+		LIBLUSTRE="done"
 	fi
 
-	mount | grep $MOUNT && sh llmountcleanup.sh
+	$CLEANUP
 done
 
 if [ "$REPLAY_SINGLE" != "no" ]; then
-	sh replay-single.sh
+        title replay-single
+	bash replay-single.sh
+	REPLAY_SINGLE="done"
 fi
 
 if [ "$CONF_SANITY" != "no" ]; then
-        sh conf-sanity.sh
+        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
+
+
+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