From: Nathaniel Clark <nathaniel.l.clark@intel.com>
Date: Thu, 31 Aug 2017 19:54:53 +0000 (-0400)
Subject: LU-9888 tests: Update disk2_7-zfs.tar.bz2 for quota
X-Git-Tag: 2.10.2-RC1~31
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F29068%2F3;p=fs%2Flustre-release.git

LU-9888 tests: Update disk2_7-zfs.tar.bz2 for quota

Add a blimit file with the larger 40960 limit in it, as this seems to
be how the image was created, but the default (without this file) is
20K.
Also add an ilimit file with 4 (default for new images).  Old default
value is 2.

This patch rolls in LU-9826 fix for larger ZFS
Lustre-change: https://review.whamcloud.com/28464
Lustre-commit: 6ab9866730c1bd2344869502586fc322f6ed7b71

This patch on master
Lustre-change: https://review.whamcloud.com/28820
Lustre-commit: f37b25fbb4acf3f96ebc61bb4d9137a8f0401e35

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: I33921ac58a5252f3259145d5e00faedcd21559f9
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/29068
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 7ba2dfe..35f0225 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -78,8 +78,8 @@ if [[ "$LDISKFS_MKFS_OPTS" != *lazy_itable_init* ]]; then
 fi
 
 [ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
-# bug number for skipped test:        LU-9826
-	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 32b"
+# bug number for skipped test:
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT"
 
 init_logging
 
diff --git a/lustre/tests/disk2_7-zfs.tar.bz2 b/lustre/tests/disk2_7-zfs.tar.bz2
index 62ed6e7..9394db83 100644
Binary files a/lustre/tests/disk2_7-zfs.tar.bz2 and b/lustre/tests/disk2_7-zfs.tar.bz2 differ