From: Nathaniel Clark <nathaniel.l.clark@intel.com>
Date: Mon, 4 Nov 2013 11:35:11 +0000 (-0500)
Subject: LU-2829 tests: Decrease load on zfs for sanityn/33a-b
X-Git-Tag: 2.5.52~85
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=4add39c3775a69c2b3daf212b8e3fc9976bd53e6

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

Decrease number of files when testing sanityn/33a and 33b when using
ZFS due to performance issues (cf LU-2887).  ZFS performance when
commit_on_sharing is enabled is very slow.

Test-Parameters: ostcount=2 envdefinitions=SLOW=yes testlist=sanityn mdsfilesystemtype=zfs mdtfilesystemtype=zfs ostfilesystemtype=zfs
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: I55b9267a3df68abc631b7d47886fb4b0f7e81594
Reviewed-on: http://review.whamcloud.com/8161
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index 597cdc8..3053a92 100644
--- 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"