X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Facceptance-small.sh;h=67cd60b45fca58fb55309df6d502e9ba8c580078;hp=912e1846ba4d0a697731d2e5d2a90fbeecec929b;hb=0a714ba01bbcdb43fa2d07e88652be2b8fb1c52f;hpb=da7866c0515ca699078e1560108b64a2a07b5831

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 912e184..67cd60b 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -23,7 +23,7 @@ fi
 [ "$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 RECOVERY_MDS_SCALE"
+export TESTSUITE_LIST="RUNTESTS SANITY DBENCH BONNIE IOZONE FSX SANITYN LFSCK LIBLUSTRE RACER REPLAY_SINGLE CONF_SANITY RECOVERY_SMALL REPLAY_OST_SINGLE REPLAY_DUAL REPLAY_VBR INSANITY SANITY_QUOTA SANITY_SEC SANITY_GSS PERFORMANCE_SANITY LARGE_SCALE RECOVERY_MDS_SCALE RECOVERY_DOUBLE_SCALE RECOVERY_RANDOM_SCALE PARALLEL_SCALE LREPLICATE_TEST METADATA_UPDATES OST_POOLS SANITY_BENCHMARK"
 
 if [ "$ACC_SM_ONLY" ]; then
     for O in $TESTSUITE_LIST; do
@@ -58,9 +58,12 @@ FORMAT=${FORMAT:-formatall}
 CLEANUP=${CLEANUP:-stopall}
 
 setup_if_needed() {
+    nfs_client_mode && return
+
     local MOUNTED=$(mounted_lustre_filesystems)
     if $(echo $MOUNTED | grep -w -q $MOUNT); then
         check_config $MOUNT
+        init_facets_vars
         init_param_vars
         return
     fi
@@ -107,11 +110,6 @@ 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 
 	assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
 	assert_env FSNAME MOUNT MOUNT2
@@ -332,8 +330,12 @@ for NAME in $CONFIGS; do
 		#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
+			if [ "$LIBLUSTRE_EXCEPT" ]; then
+				LIBLUSTRE_OPT="$LIBLUSTRE_OPT \
+					$(echo ' '$LIBLUSTRE_EXCEPT  | sed -re 's/\s+/ -e /g')"
+			fi
+			echo $LIBLUSTRETESTS/sanity --target=$LIBLUSTRE_MOUNT_TARGET $LIBLUSTRE_OPT
+			$LIBLUSTRETESTS/sanity --target=$LIBLUSTRE_MOUNT_TARGET $LIBLUSTRE_OPT
 		fi
 		$CLEANUP
 		#$SETUP
@@ -348,14 +350,20 @@ for NAME in $CONFIGS; do
 		[ "$SLOW" = "no" ] && DURATION=300
 		RACERCLIENTS=$HOSTNAME
 		[ ! -z ${CLIENTS} ] && RACERCLIENTS=$CLIENTS
-		log "racer on clients: $RACERCLIENTS DURATION=$DURATION"
-		CLIENTS=${RACERCLIENTS} DURATION=$DURATION bash runracer
+		log "racer on clients: $RACERCLIENTS DURATION=$DURATION RACERDIRS=$RACERDIRS"
+		CLIENTS=${RACERCLIENTS} DURATION=$DURATION bash runracer $RACERDIRS
 		$CLEANUP
 		$SETUP
 		RACER="done"
 	fi
 done
 
+if [ "$SANITY_BENCHMARK" != "no" ]; then
+        title sanity-benchmark
+	bash sanity-benchmark.sh
+	SANITY_BENCHMARK="done"
+fi
+
 [ "$REPLAY_SINGLE" != "no" ] && skip_remmds replay-single && REPLAY_SINGLE=no && MSKIPPED=1
 if [ "$REPLAY_SINGLE" != "no" ]; then
         title replay-single
@@ -392,6 +400,13 @@ if [ "$REPLAY_DUAL" != "no" ]; then
         REPLAY_DUAL="done"
 fi
 
+[ "$REPLAY_VBR" != "no" ] && skip_remmds replay-vbr && REPLAY_VBR=no && MSKIPPED=1
+if [ "$REPLAY_VBR" != "no" ]; then
+        title replay-vbr
+        bash replay-vbr.sh
+        REPLAY_VBR="done"
+fi
+
 [ "$INSANITY" != "no" ] && skip_remmds insanity && INSANITY=no && MSKIPPED=1
 [ "$INSANITY" != "no" ] && skip_remost insanity && INSANITY=no && OSKIPPED=1
 if [ "$INSANITY" != "no" ]; then
@@ -423,6 +438,24 @@ if [ "$SANITY_GSS" != "no" ]; then
         SANITY_GSS="done"
 fi
 
+
+[ "$LREPLICATE_TEST" != "no" ] && skip_remmds lreplicate-test && LREPLICATE_TEST=no && MSKIPPED=1
+[ "$LREPLICATE_TEST" != "no" ] && skip_remost lreplicate-test && LREPLICATE_TEST=no && OSKIPPED=1
+if [ "$LREPLICATE_TEST" != "no" ]; then
+        title lreplicate-test
+        bash lreplicate-test.sh
+        LREPLICATE_TEST="done"
+fi
+
+[ "$OST_POOLS" != "no" ] && skip_remmds ost-pools && OST_POOLS=no && MSKIPPED=1
+[ "$OST_POOLS" != "no" ] && skip_remost ost-pools && OST_POOLS=no && OSKIPPED=1
+if [ "$OST_POOLS" != "no" ]; then
+        title ost-pools
+        bash ost-pools.sh
+        OST_POOLS="done"
+fi
+
+
 [ "$SLOW" = no ] && PERFORMANCE_SANITY="no"
 [ -x "$MDSRATE" ] || PERFORMANCE_SANITY="no"
 which mpirun > /dev/null 2>&1 || PERFORMANCE_SANITY="no"
@@ -432,7 +465,13 @@ if [ "$PERFORMANCE_SANITY" != "no" ]; then
         PERFORMANCE_SANITY="done"
 fi
 
-[ "$SLOW" = no ] && RECOVERY_MDS_SCALE="no"
+[ "$LARGE_SCALE" != "no" ] && skip_remmds large-scale && LARGE_SCALE=no && MSKIPPED=1
+if [ "$LARGE_SCALE" != "no" ]; then
+        title large-scale
+        bash large-scale.sh
+        LARGE_SCALE="done"
+fi
+
 [ "$RECOVERY_MDS_SCALE" != "no" ] && skip_remmds recovery-mds-scale && RECOVERY_MDS_SCALE=no && MSKIPPED=1
 [ "$RECOVERY_MDS_SCALE" != "no" ] && skip_remost recovery-mds-scale && RECOVERY_MDS_SCALE=no && OSKIPPED=1
 if [ "$RECOVERY_MDS_SCALE" != "no" ]; then
@@ -441,6 +480,34 @@ if [ "$RECOVERY_MDS_SCALE" != "no" ]; then
         RECOVERY_MDS_SCALE="done"
 fi
 
+[ "$RECOVERY_DOUBLE_SCALE" != "no" ] && skip_remmds recovery-double-scale && RECOVERY_DOUBLE_SCALE=no && MSKIPPED=1
+[ "$RECOVERY_DOUBLE_SCALE" != "no" ] && skip_remost recovery-double-scale && RECOVERY_DOUBLE_SCALE=no && OSKIPPED=1
+if [ "$RECOVERY_DOUBLE_SCALE" != "no" ]; then
+        title recovery-double-scale
+        bash recovery-double-scale.sh
+        RECOVERY_DOUBLE_SCALE="done"
+fi
+
+[ "$RECOVERY_RANDOM_SCALE" != "no" ] && skip_remmds recovery-random-scale && RECOVERY_RANDOM_SCALE=no && MSKIPPED=1
+if [ "$RECOVERY_RANDOM_SCALE" != "no" ]; then
+        title recovery-random-scale
+        bash recovery-random-scale.sh
+        RECOVERY_RANDOM_SCALE="done"
+fi
+
+which mpirun > /dev/null 2>&1 || PARALLEL_SCALE="no"
+if [ "$PARALLEL_SCALE" != "no" ]; then
+        title parallel-scale
+        bash parallel-scale.sh
+        PARALLEL_SCALE="done"
+fi
+
+if [ "$METADATA_UPDATES" != "no" ]; then
+        title metadata-updates
+        bash metadata-updates.sh
+        METADATA_UPDATES="done"
+fi
+
 RC=$?
 title FINISHED
 echo "Finished at `date` in $((`date +%s` - $STARTTIME))s"