X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fperformance-sanity.sh;h=c4004ff56a8668360126713f1cd38bd0bc9d75e5;hb=010425898fa4b2abc6325a8073e20cb994ce7947;hp=0139f0c6b24e73a005396c1534b4ffa8fd94831f;hpb=275c3313220736cd5ba838b31bb4ccafefa56f5f;p=fs%2Flustre-release.git

diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh
index 0139f0c..c4004ff 100644
--- a/lustre/tests/performance-sanity.sh
+++ b/lustre/tests/performance-sanity.sh
@@ -1,38 +1,24 @@
 #!/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 $@
+init_logging
 
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
-
-[ -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 15266
-ALWAYS_EXCEPT="1     2     6     $PERFORMANCE_SANITY_EXCEPT"
-
+ALWAYS_EXCEPT="$PERFORMANCE_SANITY_EXCEPT "
 build_test_filter
 
-# single-IOR-rates
-test_1() {
-    echo "Single client I/O performance as a percentage of raw"
-}
-run_test 1 "single-client IO perf ====="
+[ -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."
 
-# parallel-IOR-rates 
-test_2() {
-    echo "MPI coordinated test of parallel filesystem system calls and library functions"
-}
-run_test 2 "multi-client IO perf ====="
+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
 
 # mdsrate-create-small
 test_3() {
@@ -43,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() {
@@ -76,6 +65,7 @@ test_8() {
 }
 run_test 8 "getattr large files ======"
 
-equals_msg `basename $0`: test complete, cleaning up
+complete $SECONDS
 check_and_cleanup_lustre
 [ -f "$LOG" ] && cat $LOG || true
+exit_status