X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fperformance-sanity.sh;h=cc27c3eeed5cc77ace22eb2d55866250aa077cb1;hb=13a0066afb8d89b12653ff72f7311fd5e03ef6b4;hp=fd13747e68939291286bcc90095b691573d6dea2;hpb=8c4f96f910786ff3d73474ef5f8d4a96a30a0bed;p=fs%2Flustre-release.git

diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh
index fd13747..cc27c3e 100644
--- a/lustre/tests/performance-sanity.sh
+++ b/lustre/tests/performance-sanity.sh
@@ -14,12 +14,12 @@ init_test_env $@
 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
 
@@ -27,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"
@@ -48,10 +36,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 +72,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