X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fperformance-sanity.sh;h=719b68229c57745a12b9a65d65707e01a1be118c;hb=b78fb445555916e380b1661546c821df14098596;hp=1846fd820c0cd7848ee8abb3a43330e4848f7493;hpb=4e630228f68eefa6729b9d2ff3c3e7ace2b11f9a;p=fs%2Flustre-release.git

diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh
index 1846fd8..719b682 100644
--- a/lustre/tests/performance-sanity.sh
+++ b/lustre/tests/performance-sanity.sh
@@ -11,6 +11,7 @@ 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 || \
@@ -22,6 +23,10 @@ ALWAYS_EXCEPT="1     2    $PERFORMANCE_SANITY_EXCEPT"
 
 build_test_filter
 
+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"
@@ -43,6 +48,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
 }
@@ -76,7 +84,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