X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fauster;h=d8570cc26d1180e840dd1b9985b3ef0fc933de1b;hp=38b6b4e7eb02ba58b10a25bbd0427a6dcd5dd81f;hb=a8347b4796303fb50b2b34f53d0b172bad94583e;hpb=39b98cb351866da5648ea1a2216c108f8791226f

diff --git a/lustre/tests/auster b/lustre/tests/auster
index 38b6b4e..d8570cc 100755
--- a/lustre/tests/auster
+++ b/lustre/tests/auster
@@ -11,16 +11,18 @@
 set -e
 
 export TF_FAIL=/tmp/tf.fail
+export TF_SKIP=/tmp/tf.skip
 
 usage() {
-    less -F <<EOF 
-Usage ${0##*/} [options]  suite [suite optoins] [suite [suite options]]
+    less -F <<EOF
+Usage ${0##*/} [options]  suite [suite options] [suite [suite options]]
 Run Lustre regression tests suites.
       -c CONFIG Test environment config file
       -d LOGDIR Top level directory for logs
       -D FULLLOGDIR Full directory for logs
       -f STR    Config name (cfg/<name>.sh)
       -g GROUP  Test group file (Overrides tests listed on command line)
+      -S TESTSUITE First test suite to run allows for restarts
       -i N      Repeat tests N times (default 1). A new directory
                 will be created under LOGDIR for each iteration.
       -k        Don't stop when subtests fail
@@ -28,7 +30,7 @@ Run Lustre regression tests suites.
       -r        Reformat (during initial configuration if needed)
       -s        SLOW=yes
       -v        Verbose mode
-      -l        Send logs to the Maloo database after run 
+      -l        Send logs to the Maloo database after run
                   (can be done later by running maloo_upload.sh)
       -h        This help.
 
@@ -51,7 +53,7 @@ the default "local" configuration.
 
 Run all tests in the regression group 5 times using large config.
 
-  auster -f large -g test-groups/regression  -r 5 
+  auster -f large -g test-groups/regression  -r 5
 
 EOF
     exit
@@ -64,24 +66,25 @@ repeat_count=1
 upload_logs=false
 reformat=false
 test_logs_dir=/tmp/test_logs/$(date +%Y-%m-%d)/$(date +%H%M%S)
-export SLOW=no
+export ${SLOW:=no}
 export ${NAME:=local}
-while getopts "c:d:D:nkf:g:i:rRslhv" opt
+while getopts "c:d:D:nkf:S:g:i:rRslhv" opt
 do
     case "$opt" in
-	c) CONFIG=$OPTARG;;
-	d) test_logs_dir=$OPTARG/$(date +%Y-%m-%d)/$(date +%H%M%S);;
-	D) test_logs_dir=$OPTARG;;
-	g) test_group_file=$OPTARG;;
-	k) export FAIL_ON_ERROR=false;;
+        c) CONFIG=$OPTARG;;
+        d) test_logs_dir=$OPTARG/$(date +%Y-%m-%d)/$(date +%H%M%S);;
+        D) test_logs_dir=$OPTARG;;
+        g) test_group_file=$OPTARG;;
+        S) FIRST_SUITE=$OPTARG;;
+        k) export FAIL_ON_ERROR=false;;
         n) dry_run=:;;
         v) verbose=:;;
-	i) repeat_count=$OPTARG;;
-	f) NAME=$OPTARG;;
-	R) do_reset=:;;
-	r) reformat=:;;
-	s) SLOW=yes;;
-	l) upload_logs=true;;
+        i) repeat_count=$OPTARG;;
+        f) NAME=$OPTARG;;
+        R) do_reset=:;;
+        r) reformat=:;;
+	s) export SLOW=yes;;
+        l) upload_logs=true;;
         h|\?) usage;;
     esac
 done
@@ -96,7 +99,7 @@ fi
 
 #
 # Various paramters for the tests scripts
-# 
+#
 #: ${SIZE:=$((RAMKB * 2))}
 #: ${RSIZE:=512}
 #: ${UID:=1000}
@@ -107,8 +110,8 @@ fi
 
 reset_lustre() {
     if $do_reset; then
-	stopall
-	setupall
+        stopall
+        setupall
     fi
 }
 
@@ -132,7 +135,7 @@ setup_if_needed() {
     auster_cleanup=false
 
     local MOUNTED=$(mounted_lustre_filesystems)
-    if $(echo $MOUNTED | grep -w -q $MOUNT); then
+    if $(echo $MOUNTED' ' | grep -w -q $MOUNT' '); then
         check_config_clients $MOUNT
        # init_facets_vars
        # init_param_vars
@@ -144,7 +147,7 @@ setup_if_needed() {
     setupall
 
     MOUNTED=$(mounted_lustre_filesystems)
-    if ! $(echo $MOUNTED | grep -w -q $MOUNT); then
+    if ! $(echo $MOUNTED' ' | grep -w -q $MOUNT' '); then
         echo "Lustre is not mounted after setup! "
         exit 1
     fi
@@ -153,7 +156,7 @@ setup_if_needed() {
 
 cleanup_if_needed() {
     if $auster_cleanup; then
-	cleanupall
+        cleanupall
     fi
 }
 
@@ -161,14 +164,14 @@ find_script_in_path() {
     target=$1
     path=$2
     for dir in $(tr : " " <<< $path); do
-      if [ -e $dir/$target ]; then
-	  echo $dir/$target
-          return 0
-      fi
-      if [ -e $dir/$target.sh ]; then
-	  echo $dir/$target.sh
-          return 0
-      fi
+        if [ -f $dir/$target ]; then
+            echo $dir/$target
+            return 0
+        fi
+        if [ -f $dir/$target.sh ]; then
+            echo $dir/$target.sh
+            return 0
+        fi
     done
     return 1
 }
@@ -183,31 +186,35 @@ doit() {
         return 0
     fi
     if $verbose; then
-        printf "Running: %s\n" "$*" 
+        printf "Running: %s\n" "$*"
     fi
     "$@"
 }
 
 
 run_suite() {
-    suite_name=$1
-    suite_script=$2
-    title $suite_name
-    log_test $suite_name
-
-    rm -f $TF_FAIL
-    local start_ts=$(date +%s)
-    doit bash $suite_script
-    rc=$?
-    duration=$(($(date +%s) - $start_ts))
-    if [ -f $TF_FAIL -o $rc -ne 0 ]; then
-        status="FAIL"
-    else
-        status="PASS"
-    fi
-    log_test_status $duration $status
+	local suite_name=$1
+	local suite_script=$2
+	title $suite_name
+	log_test $suite_name
+
+	rm -f $TF_FAIL
+	touch $TF_SKIP
+	local start_ts=$(date +%s)
+	doit bash $suite_script
+	local rc=$?
+	local duration=$(($(date +%s) - $start_ts))
+
+	local status="PASS"
+	if [[ $rc -ne 0 || -f $TF_FAIL ]]; then
+		status="FAIL"
+	elif [[ -f $TF_SKIP ]]; then
+		status="SKIP"
+	fi
+	log_test_status $duration $status
+	[[ ! -f $TF_SKIP ]] || rm -f $TF_SKIP
 
-    reset_lustre
+	reset_lustre
 }
 
 run_suite_logged() {
@@ -220,13 +227,13 @@ run_suite_logged() {
         echo "Can't find test script for $suite_name"
         return 1
     fi
-    
+
     echo "run_suite $suite_name $suite_script"
     local log_name=${suite_name}.suite_log.$(hostname -s).log
     if $verbose; then
-	run_suite $suite_name $suite_script 2>&1 |tee  $LOGDIR/$log_name
+        run_suite $suite_name $suite_script 2>&1 |tee  $LOGDIR/$log_name
     else
-	run_suite $suite_name $suite_script > $LOGDIR/$log_name 2>&1
+        run_suite $suite_name $suite_script > $LOGDIR/$log_name 2>&1
     fi
 
 }
@@ -247,52 +254,56 @@ run_suites() {
     local n=0
     local argv=("$@")
     while ((n < repeat_count)); do
-	local RC=0
-	local logdir=${test_logs_dir}
-	((repeat_count > 1)) && logdir="$logdir/$n"
-	reset_logging $logdir
-	set -- "${argv[@]}"
-	while [[ -n $1 ]]; do
-	    unset ONLY EXCEPT START_AT STOP_AT
-	    local opts=""
-	    local time_limit=""
-#	    echo "argv: $*"
-	    suite=$1
-	    shift;
-	    while [[ -n $1 ]]; do
-		case "$1" in
-		    --only)
-			shift;
-			export ONLY=$(split_commas $1)
-			opts+="ONLY=$ONLY ";;
-		    --except)
-			shift;
-			export EXCEPT=$(split_commas $1)
-			opts+="EXCEPT=$EXCEPT ";;
-		    --start-at)
-			shift;
-			export START_AT=$1
-			opts+="START_AT=$START_AT ";;
-	            --stop-at)
-			shift;
-			export STOP_AT=$1
-			opts+="STOP_AT=$STOP_AT ";;
-		    --time-limit)
-			shift;
-			time_limit=$1;;
-		    *)
-			break;;
-		esac
-		shift
-	    done
-	    echo "running: $suite $opts"
-	    run_suite_logged $suite || RC=$?
-	    echo $suite returned $RC
-	done
-	if $upload_logs; then
-	    $upload_script $LOGDIR
-	fi
-	n=$((n + 1))
+        local RC=0
+        local logdir=${test_logs_dir}
+        local first_suite=$FIRST_SUITE
+        ((repeat_count > 1)) && logdir="$logdir/$n"
+        reset_logging $logdir
+        set -- "${argv[@]}"
+        while [[ -n $1 ]]; do
+            unset ONLY EXCEPT START_AT STOP_AT
+            local opts=""
+            local time_limit=""
+            #echo "argv: $*"
+            suite=$1
+            shift;
+            while [[ -n $1 ]]; do
+                case "$1" in
+                    --only)
+                        shift;
+                        export ONLY=$(split_commas $1)
+                        opts+="ONLY=$ONLY ";;
+                    --except)
+                        shift;
+                        export EXCEPT=$(split_commas $1)
+                        opts+="EXCEPT=$EXCEPT ";;
+                    --start-at)
+                        shift;
+                        export START_AT=$1
+                        opts+="START_AT=$START_AT ";;
+                    --stop-at)
+                        shift;
+                        export STOP_AT=$1
+                        opts+="STOP_AT=$STOP_AT ";;
+                    --time-limit)
+                        shift;
+                        time_limit=$1;;
+                    *)
+                        break;;
+                esac
+                shift
+            done
+            if [ "x"$first_suite == "x" ] || [ $first_suite == $suite ]; then   # If first_suite not set or this is the first suite
+                echo "running: $suite $opts"
+                run_suite_logged $suite || RC=$?
+                unset first_suite
+                echo $suite returned $RC
+            fi
+        done
+        if $upload_logs; then
+            $upload_script $LOGDIR
+        fi
+        n=$((n + 1))
     done
 }
 
@@ -300,7 +311,7 @@ if [ $upload_logs = true ] ; then
     upload_script=$(find_script_in_path maloo_upload.sh $PATH:$LUSTRE/tests)
     if [[ -z $upload_script ]]; then
         echo "Can't find maloo_upload.sh script"
-        exit 1 
+        exit 1
     fi
 
     if [ ! -r ~/.maloorc ] ; then
@@ -313,8 +324,8 @@ fi
 export NAME MOUNT START CLEAN
 . ${CONFIG:-$LUSTRE/tests/cfg/$NAME.sh}
 
-assert_env mds_HOST MDS_MKFS_OPTS
-assert_env ost_HOST OST_MKFS_OPTS OSTCOUNT
+assert_env mds_HOST
+assert_env ost_HOST OSTCOUNT
 assert_env FSNAME MOUNT MOUNT2
 
 echo "Started at `date`"