LU-2829 tests: Decrease load on zfs for sanityn/33a-b

[fs/lustre-release.git] / lustre / tests / sanityn.sh

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index 56c3da6..e69caf8 100644 (file)
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -40,9 +40,12 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-[ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
+if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
 # bug number for skipped test:        LU-2840 LU-2189 LU-2776
        ALWAYS_EXCEPT="$ALWAYS_EXCEPT 21      36      51a"
+# LU-2829 / LU-2887 - make allowances for ZFS slowness
+       TEST33_NFILES=${TEST33_NFILES:-5000}
+fi
 
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="33a"
 
@@ -2300,6 +2303,9 @@ test_51a() {
 run_test 51a "layout lock: refresh layout should work"
 
 test_51b() {
+       [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.59) ]] ||
+               { skip "Need MDS version at least 2.3.59"; return 0; }
+
        local tmpfile=`mktemp`
 
        # create an empty file