LU-17914 lnet: Fix erroneous net set error

[fs/lustre-release.git] / lustre / tests / dom-performance.sh

diff --git a/lustre/tests/dom-performance.sh b/lustre/tests/dom-performance.sh
index bf5085e..ebcb4c9 100644 (file)
--- a/lustre/tests/dom-performance.sh
+++ b/lustre/tests/dom-performance.sh
@@ -7,31 +7,23 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"$DOM_PERFORMANCE_EXCEPT"}
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
-
-[ "$SLOW" = "no" ] && EXCEPT_SLOW=""
-
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
-
-init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_test_env "$@"
 init_logging
 
+ALWAYS_EXCEPT="$DOM_PERFORMANCE_EXCEPT"
+build_test_filter
+
 SAVED_FAIL_ON_ERROR=$FAIL_ON_ERROR
 FAIL_ON_ERROR=false
 
 SAVED_DEBUG=$($LCTL get_param -n debug 2> /dev/null)
 
-
 . $LUSTRE/tests/functions.sh
-build_test_filter
 check_and_setup_lustre
 
-# if MACHINEFILE set and exists -- use it
-MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh)-$(hostname).machines}
 clients=${CLIENTS:-$HOSTNAME}
 generate_machine_file $clients $MACHINEFILE ||
        error "Failed to generate machine file"
@@ -210,6 +202,9 @@ run_IOR() {
                skip_env "IOR is not installed, skipping"
        fi
 
+       # Requires at least 20GB (roughly)
+       (( MDSSIZE >= 20000000 )) || skip "Require MDS of at least 20GB"
+
        local IOR=$(which IOR)
        local iter=$((DP_FNUM / DP_NUM))
        local direct=""
@@ -436,6 +431,6 @@ run_test compbench "Performance comparision: compilebench"
 FAIL_ON_ERROR=$SAVED_FAIL_ON_ERROR
 $LCTL set_param -n debug="$SAVED_DEBUG"
 
-complete $SECONDS
+complete_test $SECONDS
 check_and_cleanup_lustre
 exit_status