LU-14264 tests: make PARALLEL available to all suites

[fs/lustre-release.git] / lustre / tests / recovery-random-scale.sh

diff --git a/lustre/tests/recovery-random-scale.sh b/lustre/tests/recovery-random-scale.sh
index 23f6ee5..c3b2d4e 100644 (file)
--- a/lustre/tests/recovery-random-scale.sh
+++ b/lustre/tests/recovery-random-scale.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
-# vim:shiftwidth=4:softtabstop=4:tabstop=4:
-
+#
 # client failure does not affect other clients
 
 # Start load on clients (each client works on it's own directory).
@@ -14,15 +13,16 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
+init_logging
+
 # bug number for skipped test:
 ALWAYS_EXCEPT="$RECOVERY_RANDOM_SCALE_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
-. $LUSTRE/tests/test-framework.sh
-init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
-init_logging
+build_test_filter
 
 remote_mds_nodsh && skip_env "remote MDS with nodsh" && exit 0
 remote_ost_nodsh && skip_env "remote OST with nodsh" && exit 0
@@ -61,16 +61,16 @@ LOAD_PID_FILE=${LOAD_PID_FILE:-$TMP/client-load.pid}
 VMSTAT_PID_FILE=${VMSTAT_PID_FILE:-$TMP/vmstat.pid}
 
 numfailovers () {
-    local facet
-    local var
-
-    for facet in $MDTS ${FAILED_CLIENTS//,/ }; do
-        var=${facet}_nums
-        val=${!var}
-        if [ "$val" ] ; then
-            echo "$facet failed over $val times"
-        fi
-    done
+       local facet
+       local var
+
+       for facet in ${MDTS//,/ } ${FAILED_CLIENTS//,/ }; do
+               var=$(node_var_name $facet)_nums
+               val=${!var}
+               if [ "$val" ] ; then
+                       echo "$facet failed over $val times"
+               fi
+       done
 }
 
 summary_and_cleanup () {
@@ -111,8 +111,6 @@ Status: $result: rc=$rc"
 }
 
 ################################## Main Flow ###################################
-build_test_filter
-
 check_and_setup_lustre
 rm -rf $DIR/[Rdfs][0-9]*
 
@@ -170,8 +168,8 @@ test_fail_client_mds() {
         # lists are comma separated
         FAILED_CLIENTS=$(expand_list $FAILED_CLIENTS $fail_client)
 
-        serverfacet=$(get_random_entry $MDTS)
-        var=${serverfacet}_nums
+       serverfacet=$(get_random_entry $MDTS)
+       var=$(node_var_name $serverfacet)_nums
 
         # Check that our client loads are still running. If any have died,
         # that means they have died outside of recovery, which is unacceptable.