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>
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
# 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"
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"
# 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
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