X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fperformance-sanity.sh;h=698d310d121ff90736718e8226823361a83121d1;hb=11eba11fe0457b735194e5924e7bb1882a5b31b8;hp=beabcc46cc8917bfeb355eb56391c228ea52763d;hpb=984482f865fc1cc3c7ecdd10b521bd479ce11688;p=fs%2Flustre-release.git

diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh
index beabcc4..698d310 100644
--- a/lustre/tests/performance-sanity.sh
+++ b/lustre/tests/performance-sanity.sh
@@ -11,14 +11,15 @@ LUSTRE=${LUSTRE:-`dirname $0`/..}
 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." 
+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"
+# bug number:
+ALWAYS_EXCEPT="  $PERFORMANCE_SANITY_EXCEPT"
 
 build_test_filter
 
@@ -26,18 +27,6 @@ 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"
@@ -47,6 +36,9 @@ run_test 3 "small file create/open/delete ======"
 
 # mdsrate-create-large
 test_4() {
+    # LU-2600/LU-4108 - Decrease load on zfs
+    [ "$SLOW" = no -a $(facet_fstype $SINGLEMDS) = zfs ] &&
+	NUM_FILES=10000
     echo "Large file creation performance"
     bash mdsrate-create-large.sh
 }
@@ -80,7 +72,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
-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true
+exit_status