X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Facceptance-small.sh;h=9d14d74a9cc8692188709cee2ff35f40c74fc4cf;hp=4296343d9d393cc5d9f6c0463d4c8f2fe05ab56c;hb=1d74a786fe386223a263e84ddb53014153f236dc;hpb=fec67e9c0e4a268249f7feaed0fc989aa3141468

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 4296343..9d14d74 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -4,8 +4,7 @@
 #set -vx
 set -e
 
-PATH=`dirname $0`/../utils:$PATH
-
+[ -z "$CONFIG" -a "$NAME" ] && CONFIGS=$NAME
 [ "$CONFIGS" ] || CONFIGS="local"  #"local lov"
 [ "$MAX_THREADS" ] || MAX_THREADS=20
 RAMKB=`awk '/MemTotal:/ { print $2 }' /proc/meminfo`
@@ -21,99 +20,204 @@ fi
 [ "$TMP" ] || TMP=/tmp
 [ "$COUNT" ] || COUNT=1000
 [ "$DEBUG_LVL" ] || DEBUG_LVL=0
-[ "$DEBUG_OFF" ] || DEBUG_OFF="sysctl -w lnet.debug=$DEBUG_LVL"
-[ "$DEBUG_ON" ] || DEBUG_ON="sysctl -w lnet.debug=0x33f0484"
+[ "$DEBUG_OFF" ] || DEBUG_OFF="eval lctl set_param debug=\"$DEBUG_LVL\""
+[ "$DEBUG_ON" ] || DEBUG_ON="eval lctl set_param debug=0x33f0484"
+
+export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE RACER REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL INSANITY SANITY_QUOTA SANITY_SEC SANITY_GSS PERFORMANCE_SANITY"
+
+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%.sh} | tr "-" "_"`
+	O=`echo $O | tr "[:lower:]" "[:upper:]"`
+	export ${O}="yes"
+    done
+fi
+LFSCK="no" # bug 13698
 
+LIBLUSTRETESTS=${LIBLUSTRETESTS:-../liblustre/tests}
 
-LIBLUSTRE=${LIBLUSTRE:-../liblustre}
-LIBLUSTRETESTS=${LIBLUSTRETESTS:-$LIBLUSTRE/tests}
+STARTTIME=`date +%s`
+RANTEST=""
 
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
 
+if $GSS; then
+    # liblustre doesn't support GSS
+    export LIBLUSTRE=no
+else
+    export SANITY_GSS="no"
+fi
+
 SETUP=${SETUP:-setupall}
 FORMAT=${FORMAT:-formatall}
 CLEANUP=${CLEANUP:-stopall}
 
 setup_if_needed() {
-    mount | grep $MOUNT && return
-    $FORMAT && $SETUP
+    local MOUNTED=$(mounted_lustre_filesystems)
+    if $(echo $MOUNTED | grep -w -q $MOUNT); then
+        check_config $MOUNT
+        return
+    fi
+
+    echo "Lustre is not mounted, trying to do setup SETUP=$SETUP ... "
+    [ "$REFORMAT" ] && $FORMAT
+    $SETUP
+
+    MOUNTED=$(mounted_lustre_filesystems)
+    if ! $(echo $MOUNTED | grep -w -q $MOUNT); then
+        echo "Lustre is not mounted after setup! SETUP=$SETUP"
+        exit 1
+    fi
 }
 
 title() {
-    echo "-----============= acceptance-small: "$*" ============-----"
+    # update titlebar if stdin is attaached to an xterm
+    if ${UPDATE_TITLEBAR:-false}; then
+	if tty -s; then
+	    case $TERM in 
+		xterm*)
+		    echo -ne "\033]2; acceptance-small: $* \007" >&0
+		    ;;
+	    esac
+	fi
+    fi 
+    log "-----============= acceptance-small: "$*" ============----- `date`"
+    RANTEST=${RANTEST}$*", "
+}
+
+skip_remost()
+{
+	remote_ost_nodsh && log "SKIP: $1: remote OST with nodsh" && return 0
+	return 1
+}
+
+skip_remmds()
+{
+	remote_mds_nodsh && log "SKIP: $1: remote MDS with nodsh" && return 0
+	return 1
 }
 
 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 mds_HOST MDS_MKFS_OPTS 
 	assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
 	assert_env FSNAME MOUNT MOUNT2
 
 	setup_if_needed
 
+	MSKIPPED=0
+	OSKIPPED=0
 	if [ "$RUNTESTS" != "no" ]; then
 	        title runtests
-		sh runtests
+		bash runtests
 		$CLEANUP
 		$SETUP
+		RUNTESTS="done"
 	fi
 
 	if [ "$SANITY" != "no" ]; then
 	        title sanity
-		SANITYLOG=/tmp/sanity.log sh sanity.sh
+		MOUNT2="" bash sanity.sh
 		$CLEANUP
 		$SETUP
+		SANITY="done"
 	fi
 
 	which dbench > /dev/null 2>&1 || DBENCH=no
 	if [ "$DBENCH" != "no" ]; then
 	        title dbench
+		DBENCHDIR=$MOUNT/$HOSTNAME
+		mkdir -p $DBENCHDIR
 		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
-		$DEBUG_ON
-		$CLEANUP
-		$SETUP
+		myUID=$RUNAS_ID
+		myRUNAS=$RUNAS
+		FAIL_ON_ERROR=false check_runas_id_ret $myUID $myRUNAS || { myRUNAS="" && myUID=$UID; }
+		chown $myUID:$myUID $DBENCHDIR
+		duration=""
+		[ "$SLOW" = "no" ] && duration=" -t 120"
+		if [ "$SLOW" != "no" -o $DB_THREADS -eq 1 ]; then
+			$myRUNAS bash rundbench -D $DBENCHDIR 1 $duration || error "dbench failed!"
+			$DEBUG_ON
+			$CLEANUP
+			$SETUP
+		fi
 		if [ $DB_THREADS -gt 1 ]; then
 			$DEBUG_OFF
-			sh rundbench $DB_THREADS
+			$myRUNAS bash rundbench -D $DBENCHDIR $DB_THREADS $duration
 			$DEBUG_ON
 			$CLEANUP
 			$SETUP
 		fi
-		rm -f /mnt/lustre/`hostname`/client.txt
+		rm -rf $DBENCHDIR
+		DBENCH="done"
 	fi
 
-	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 }'`
+		BONDIR=$MOUNT/d0.bonnie
+		mkdir -p $BONDIR
+		$LFS setstripe -c -1 $BONDIR
+		sync
+		MIN=`lctl get_param -n 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
-		bonnie++ -f -r 0 -s $((SIZE / 1024)) -n 10 -u $UID -d $MOUNT
+		myUID=$RUNAS_ID
+		myRUNAS=$RUNAS
+		FAIL_ON_ERROR=false check_runas_id_ret $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
+		BONNIE="done"
 	fi
 
 	export O_DIRECT
+	[ "$SLOW" = "no" ] && export IOZONE=no # 5 minutes
+
 	which iozone > /dev/null 2>&1 || IOZONE=no
 	if [ "$IOZONE" != "no" ]; then
 	        title iozone
-		SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
+		IOZDIR=$MOUNT/d0.iozone
+		mkdir -p $IOZDIR
+		$LFS setstripe -c -1 $IOZDIR
+		sync
+		MIN=`lctl get_param -n osc.*.kbytesavail | 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="-f $MOUNT/iozone"
+		log "min OST has ${MIN}kB available, using ${SIZE}kB file size"
+		IOZONE_OPTS="-i 0 -i 1 -i 2 -e -+d -r $RSIZE"
+		IOZFILE="$IOZDIR/iozone"
+		IOZLOG=$TMP/iozone.log
+		# $SPACE was calculated with all OSTs
 		$DEBUG_OFF
-		iozone $IOZONE_OPTS $IOZFILE
+		myUID=$RUNAS_ID
+		myRUNAS=$RUNAS
+		FAIL_ON_ERROR=false check_runas_id_ret $myUID $myRUNAS || { myRUNAS="" && myUID=$UID; }
+		chown $myUID:$myUID $IOZDIR
+		$myRUNAS iozone $IOZONE_OPTS -s $SIZE -f $IOZFILE 2>&1 | tee $IOZLOG
+		tail -1 $IOZLOG | grep -q complete || \
+			{ error "iozone (1) failed" && false; }
+		rm -f $IOZLOG
 		$DEBUG_ON
 		$CLEANUP
 		$SETUP
@@ -122,13 +226,17 @@ for NAME in $CONFIGS; do
 		if [ -z "$O_DIRECT" ]; then
 			touch $MOUNT/f.iozone
 			if ! ./directio write $MOUNT/f.iozone 0 1; then
+				log "SKIP iozone DIRECT IO test"
 				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
+			$myRUNAS iozone -I $IOZONE_OPTS -s $SIZE -f $IOZFILE.odir 2>&1 | tee $IOZLOG
+			tail -1 $IOZLOG | grep -q complete || \
+				{ error "iozone (2) failed" && false; }
+			rm -f $IOZLOG
 			$DEBUG_ON
 			$CLEANUP
 			$SETUP
@@ -139,14 +247,18 @@ for NAME in $CONFIGS; do
 		[ $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
+			$LFS setstripe -c -1 $IOZDIR
 			$DEBUG_OFF
 			THREAD=1
-			IOZFILE="-F "
+			IOZFILE=" "
 			while [ $THREAD -le $IOZ_THREADS ]; do
-				IOZFILE="$IOZFILE $MOUNT/iozone.$THREAD"
+				IOZFILE="$IOZFILE $IOZDIR/iozone.$THREAD"
 				THREAD=$((THREAD + 1))
 			done
-			iozone $IOZONE_OPTS -t $IOZ_THREADS $IOZFILE
+			$myRUNAS iozone $IOZONE_OPTS -s $((SIZE / IOZ_THREADS)) -t $IOZ_THREADS -F $IOZFILE 2>&1 | tee $IOZLOG
+			tail -1 $IOZLOG | grep -q complete || \
+				{ error "iozone (3) failed" && false; }
+			rm -f $IOZLOG
 			$DEBUG_ON
 			$CLEANUP
 			$SETUP
@@ -154,6 +266,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
@@ -161,11 +274,15 @@ for NAME in $CONFIGS; do
 		SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
 		[ $SPACE -lt $SIZE ] && SIZE=$((SPACE * 3 / 4))
 		$DEBUG_OFF
-		./fsx -c 50 -p 1000 -P $TMP -l $SIZE \
+		FSX_SEED=${FSX_SEED:-$RANDOM}
+		rm -f $MOUNT/fsxfile
+		$LFS setstripe -c -1 $MOUNT/fsxfile
+		./fsx -c 50 -p 1000 -S $FSX_SEED -P $TMP -l $SIZE \
 			-N $(($COUNT * 100)) $MOUNT/fsxfile
 		$DEBUG_ON
 		$CLEANUP
 		$SETUP
+		FSX="done"
 	fi	
 
 	if [ "$SANITYN" != "no" ]; then
@@ -175,75 +292,144 @@ for NAME in $CONFIGS; do
 		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
+		START=: CLEAN=: bash sanityN.sh
+		[ "$(mount | grep $MOUNT2)" ] && umount $MOUNT2
 
 		$DEBUG_ON
 		$CLEANUP
 		$SETUP
+		SANITYN="done"
 	fi
 
-	if [ "$LFSCK" != "no" -a -x /usr/sbin/lfsck ]; then
+	[ "$LFSCK" != "no" ] && remote_mds && log "Remote MDS, skipping LFSCK test" && LFSCK=no && MSKIPPED=1
+	[ "$LFSCK" != "no" ] && remote_ost && log "Remote OST, skipping LFSCK test" && LFSCK=no && OSKIPPED=1
+	if [ "$LFSCK" != "no" ]; then
 	        title lfsck
-		E2VER=`e2fsck -V 2>&1 | head -n 1 | cut -d' ' -f 2`
-		[ `echo $E2VER | cut -d. -f2` -ge 39 ] && \
-			[ "`echo $E2VER | grep cfs`" ] && sh lfscktest.sh
+		if [ -x /usr/sbin/lfsck ]; then
+			bash lfscktest.sh
+		else
+			log "$(e2fsck -V)"
+			log "SKIP: e2fsck does not support lfsck"
+		fi
+		LFSCK="done"
 	fi
 
+	[ "$NETTYPE" = "tcp" -o "$NETTYPE" = "ptl" ] || LIBLUSTRE=no # bug 15660
 	if [ "$LIBLUSTRE" != "no" ]; then
 	        title liblustre
-		assert_env MGSNID
+		assert_env MGSNID MOUNT2
 		export LIBLUSTRE_MOUNT_POINT=$MOUNT2
+		export LIBLUSTRE_MOUNT_RETRY=5
 		export LIBLUSTRE_MOUNT_TARGET=$MGSNID:/$FSNAME
-		export LIBLUSTRE_TIMEOUT=`cat /proc/sys/lustre/timeout`
-		#export LIBLUSTRE_DEBUG_MASK=`cat /proc/sys/lnet/debug`
+		export LIBLUSTRE_TIMEOUT=`lctl get_param -n timeout`
+		#export LIBLUSTRE_DEBUG_MASK=`lctl get_param -n 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
 
-	$CLEANUP
+	[ "$RACER" != "no" ] && [ -n "$CLIENTS" -a "$PDSH" = "no_dsh" ] && log "Remote client with no_dsh" && RACER=no 
+	if [ "$RACER" != "no" ]; then
+        	title racer
+		setup_if_needed
+		DURATION=${DURATION:-900}
+		[ "$SLOW" = "no" ] && DURATION=300
+		RACERCLIENTS=$HOSTNAME
+		[ ! -z ${CLIENTS} ] && RACERCLIENTS=$CLIENTS
+		log "racer on clients: $RACERCLIENTS DURATION=$DURATION"
+		CLIENTS=${RACERCLIENTS} DURATION=$DURATION bash runracer
+		$CLEANUP
+		$SETUP
+		RACER="done"
+	fi
 done
 
-if [ "$SANITY_QUOTA" != "no" ]; then
-        title sanity-quota
-        sh sanity-quota.sh
-fi
-
+[ "$REPLAY_SINGLE" != "no" ] && skip_remmds replay-single && REPLAY_SINGLE=no && MSKIPPED=1
 if [ "$REPLAY_SINGLE" != "no" ]; then
         title replay-single
-	sh replay-single.sh
+	bash replay-single.sh
+	REPLAY_SINGLE="done"
 fi
 
+[ "$CONF_SANITY" != "no" ] && skip_remmds conf-sanity && CONF_SANITY=no && MSKIPPED=1
+[ "$CONF_SANITY" != "no" ] && skip_remost conf-sanity && CONF_SANITY=no && OSKIPPED=1
 if [ "$CONF_SANITY" != "no" ]; then
         title conf-sanity
-        sh conf-sanity.sh
+        bash conf-sanity.sh
+        CONF_SANITY="done"
 fi
 
+[ "$RECOVERY_SMALL" != "no" ] && skip_remmds recover-small && RECOVERY_SMALL=no && MSKIPPED=1
 if [ "$RECOVERY_SMALL" != "no" ]; then
         title recovery-small
-        sh recovery-small.sh
+        bash recovery-small.sh
+        RECOVERY_SMALL="done"
 fi
 
+[ "$REPLAY_OST_SINGLE" != "no" ] && skip_remost replay-ost-single && REPLAY_OST_SINGLE=no && OSKIPPED=1
 if [ "$REPLAY_OST_SINGLE" != "no" ]; then
         title replay-ost-single
-        sh replay-ost-single.sh
+        bash replay-ost-single.sh
+        REPLAY_OST_SINGLE="done"
 fi
 
+[ "$REPLAY_DUAL" != "no" ] && skip_remost replay-dual && REPLAY_DUAL=no && OSKIPPED=1
 if [ "$REPLAY_DUAL" != "no" ]; then
         title replay-dual
-        sh replay-dual.sh
+        bash replay-dual.sh
+        REPLAY_DUAL="done"
 fi
 
+[ "$INSANITY" != "no" ] && skip_remmds insanity && INSANITY=no && MSKIPPED=1
+[ "$INSANITY" != "no" ] && skip_remost insanity && INSANITY=no && OSKIPPED=1
 if [ "$INSANITY" != "no" ]; then
         title insanity
-        sh insanity.sh -r
+        bash insanity.sh -r
+        INSANITY="done"
 fi
 
-title FINISHED
+[ "$SANITY_QUOTA" != "no" ] && skip_remmds sanity-quota && SANITY_QUOTA=no && MSKIPPED=1
+[ "$SANITY_QUOTA" != "no" ] && skip_remost sanity-quota && SANITY_QUOTA=no && OSKIPPED=1
+if [ "$SANITY_QUOTA" != "no" ]; then
+        title sanity-quota
+        bash sanity-quota.sh
+        SANITY_QUOTA="done"
+fi
+
+[ "$SANITY_SEC" != "no" ] && skip_remmds sanity-sec && SANITY_SEC=no && MSKIPPED=1
+[ "$SANITY_SEC" != "no" ] && skip_remost sanity-sec && SANITY_SEC=no && OSKIPPED=1
+if [ "$SANITY_SEC" != "no" ]; then
+        title sanity-sec
+        bash sanity-sec.sh
+        SANITY_SEC="done"
+fi
+
+[ "$SANITY_GSS" != "no" ] && skip_remmds sanity-gss && SANITY_GSS=no && MSKIPPED=1
+if [ "$SANITY_GSS" != "no" ]; then
+        title sanity-gss
+        bash sanity-gss.sh
+        SANITY_GSS="done"
+fi
+
+[ "$SLOW" = no ] && PERFORMANCE_SANITY="no"
+[ -x "$MDSRATE" ] || PERFORMANCE_SANITY="no"
+which mpirun > /dev/null 2>&1 || PERFORMANCE_SANITY="no"
+if [ "$PERFORMANCE_SANITY" != "no" ]; then
+        title performance-sanity
+        bash performance-sanity.sh
+        PERFORMANCE_SANITY="done"
+fi
 
 RC=$?
+title FINISHED
+echo "Finished at `date` in $((`date +%s` - $STARTTIME))s"
+echo "Tests ran: $RANTEST"
+print_summary
+[ "$MSKIPPED" = 1 ] && log "FAIL: remote MDS tests skipped" && RC=1
+[ "$OSKIPPED" = 1 ] && log "FAIL: remote OST tests skipped" && RC=1
 echo "$0: completed with rc $RC" && exit $RC