From: Li Dongyang <dongyangli@ddn.com>
Date: Sun, 28 Oct 2018 18:14:05 +0000 (-0700)
Subject: LU-11215 tests: replace "large_xattr" with "ea_inode"
X-Git-Tag: 2.10.6-RC2~7
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;ds=sidebyside;h=c7ac1c5416e9011cb7c36bc7bdf072ff3065f55a;p=fs%2Flustre-release.git

LU-11215 tests: replace "large_xattr" with "ea_inode"

Change the test scripts over to using the "ea_inode" name, since
this is what the upstream e2fsprogs is using.  The "large_xattr"
feature name was only ever used in the Lustre-patched e2fsprogs.

Don't try to turn off "ea_inode" feature on the targets anymore,
it's not supported by upstream e2fsprogs.

e2fsprogs commit: 5b72578279fe2470e682692a15d70a43d9289e0f

This patch is back-ported from the following one:
Lustre-commit: 900a1b6e4271a6c1903d6723082a01c98defe7b2
Lustre-change: https://review.whamcloud.com/33012

Test-Parameters: trivial testlist=conf-sanity
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Change-Id: I83bd303827fa28050d1d6d2416b2d630dc94ec12
Reviewed-on: https://review.whamcloud.com/33503
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index f8c5623..641b606 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4460,7 +4460,7 @@ test_61() { # LU-80
 		lxattr=true
 
 		for num in $(seq $MDSCOUNT); do
-			do_facet mds${num} $TUNE2FS -O large_xattr \
+			do_facet mds${num} $TUNE2FS -O ea_inode \
 				$(mdsdevname $num) ||
 				error "tune2fs on mds $num failed"
 		done
@@ -4522,14 +4522,7 @@ test_61() { # LU-80
 
 	# need to delete this file to avoid problems in other tests
 	rm -f $file
-	stopall || error "stopping systems to turn off large_xattr"
-	if $lxattr; then
-		for num in $(seq $MDSCOUNT); do
-			do_facet mds${num} $TUNE2FS -O ^large_xattr \
-				$(mdsdevname $num) ||
-				error "tune2fs on mds $num failed"
-		done
-	fi
+	stopall || error "stopping systems failed"
 }
 run_test 61 "large xattr"
 
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 11b4ab2..5ba0434 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7340,7 +7340,7 @@ test_102h() { # bug 15777
 run_test 102h "grow xattr from inside inode to external block"
 
 test_102ha() {
-	large_xattr_enabled || { skip "large_xattr disabled" && return; }
+	large_xattr_enabled || { skip "ea_inode feature disabled" && return; }
 	grow_xattr $(max_xattr_size)
 }
 run_test 102ha "grow xattr from inside inode to external inode"
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 3f13415..ec90851 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -3828,7 +3828,7 @@ mkfs_opts() {
 			# Check for wide striping
 			if [ $OSTCOUNT -gt 160 ]; then
 				MDSJOURNALSIZE=${MDSJOURNALSIZE:-4096}
-				fs_mkfs_opts+="-O large_xattr"
+				fs_mkfs_opts+="-O ea_inode"
 			fi
 
 			var=${facet}_JRN
@@ -7649,7 +7649,9 @@ get_block_size() {
 	echo -n ${size:-0}
 }
 
-# Check whether the "large_xattr" feature is enabled or not.
+# Check whether the "ea_inode" feature is enabled or not, to allow
+# ldiskfs xattrs over one block in size.  Allow both the historical
+# Lustre feature name (large_xattr) and the upstream name (ea_inode).
 large_xattr_enabled() {
 	[[ $(facet_fstype $SINGLEMDS) == zfs ]] && return 0