LU-15132 hsm: Protect against parallel HSM restore requests

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

diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh
index fd13747..c4004ff 100644 (file)
--- a/lustre/tests/performance-sanity.sh
+++ b/lustre/tests/performance-sanity.sh
@@ -1,44 +1,25 @@
 #!/bin/bash
-#set -vx
 set -e
 
-TESTNAME=`basename $0 .sh`
-TMP=${TMP:-/tmp}
+TESTNAME=$(basename $0 .sh)
 LOG=${LOG:-"$TMP/${TESTNAME}.log"}
 
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-[ -x "$MDSRATE" ] || FAIL_ON_ERROR=true error "No mdsrate program. Aborting."
-which mpirun > /dev/null 2>&1 || \
-       FAIL_ON_ERROR=true error "No mpirun program. Aborting." 
-
-# Skip these tests
-# bug number:  15266 15266 
-ALWAYS_EXCEPT="1     2    $PERFORMANCE_SANITY_EXCEPT"
-
+ALWAYS_EXCEPT="$PERFORMANCE_SANITY_EXCEPT "
 build_test_filter
 
+[ -x "$MDSRATE" ] || FAIL_ON_ERROR=true error "No mdsrate program. Aborting."
+which mpirun > /dev/null 2>&1 ||
+       FAIL_ON_ERROR=true error "No mpirun program. Aborting."
+
 get_mpiuser_id $MPI_USER
 MPI_RUNAS=${MPI_RUNAS:-"runas -u $MPI_USER_UID -g $MPI_USER_GID"}
 $GSS_KRB5 && refresh_krb5_tgt $MPI_USER_UID $MPI_USER_GID $MPI_RUNAS
 
-# single-IOR-rates
-test_1() {
-    echo "Single client I/O performance as a percentage of raw"
-}
-run_test 1 "single-client IO perf ====="
-
-# parallel-IOR-rates 
-test_2() {
-    echo "MPI coordinated test of parallel filesystem system calls and library functions"
-}
-run_test 2 "multi-client IO perf ====="
-
 # mdsrate-create-small
 test_3() {
     echo "File creation performance tests for file objects"
@@ -48,10 +29,13 @@ run_test 3 "small file create/open/delete ======"
 
 # mdsrate-create-large
 test_4() {
-    echo "Large file creation performance"
-    bash mdsrate-create-large.sh
+       # LU-2600/LU-4108 - Decrease load on zfs
+       [ "$SLOW" = no -a "$mds1_FSTYPE" = zfs ] &&
+               NUM_FILES=10000
+       echo "Large file creation performance"
+       bash mdsrate-create-large.sh
 }
-run_test 4 "large file create/open/delete ======"
+run_test 4 "large file create/open/delete"
 
 # mdsrate-lookup-1dir
 test_5() {
@@ -81,7 +65,7 @@ test_8() {
 }
 run_test 8 "getattr large files ======"
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 check_and_cleanup_lustre
 [ -f "$LOG" ] && cat $LOG || true
 exit_status