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

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/33012
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index d4ada59..2535a64 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4471,7 +4471,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
@@ -4533,14 +4533,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"
 
@@ -8017,7 +8010,7 @@ test_115() {
        do_facet $SINGLEMDS "losetup $mdsdev $mdsimgname"
 
        local mds_opts="$(mkfs_opts mds1 ${mdsdev}) --device-size=$IMAGESIZE   \
-               --mkfsoptions='-O lazy_itable_init,large_xattr,^resize_inode,meta_bg \
+               --mkfsoptions='-O lazy_itable_init,ea_inode,^resize_inode,meta_bg \
                -i 1024'"
        add mds1 $mds_opts --mgs --reformat $mdsdev ||
                { skip_env "format large MDT failed"; return 0; }

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e63d910..868be7a 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -8136,7 +8136,7 @@ test_102h() { # bug 15777
 run_test 102h "grow xattr from inside inode to external block"
 
 test_102ha() {
-       large_xattr_enabled || skip_env "large_xattr disabled"
+       large_xattr_enabled || skip_env "ea_inode feature disabled"
 
        grow_xattr $(max_xattr_size)
 }
@@ -18231,7 +18231,7 @@ run_test 315 "read should be accounted"
 
 test_316() {
        [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
-       large_xattr_enabled || skip_env "large_xattr disabled"
+       large_xattr_enabled || skip_env "ea_inode feature disabled"
 
        rm -rf $DIR/$tdir/d
        mkdir -p $DIR/$tdir/d

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 935708b..c7cd6d2 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -4240,7 +4240,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
@@ -8096,7 +8096,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