From a3cba2ead76b01fa7176588f3e2c3e44120f1282 Mon Sep 17 00:00:00 2001 From: James Nunez Date: Tue, 12 May 2020 12:38:24 -0600 Subject: [PATCH] LU-13547 tests: remove ea_inode from mkfs MDT options The large_dir and ea_inode is enabled by default when MDTs are formatted. Thus, remove 'ea_inode' and 'large_dir' from the mkfs options in the test-framework. Add a test to make sure that these MDT features are enabled by default. Signed-off-by: James Nunez Change-Id: I1b3f1bee7e0c091f8fffc9da0e769eed921dac8f Reviewed-on: https://review.whamcloud.com/38582 Reviewed-by: Andreas Dilger Reviewed-by: Li Dongyang Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 19 +++++++++++++++++-- lustre/tests/test-framework.sh | 5 ----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 702a020..7eae993 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -5013,7 +5013,7 @@ test_59() { } run_test 59 "writeconf mount option" -test_60() { # LU-471 +test_60a() { # LU-471 if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "ldiskfs only test" fi @@ -5039,7 +5039,22 @@ test_60() { # LU-471 stop_mds reformat_and_config } -run_test 60 "check mkfs.lustre --mkfsoptions -E -O options setting" +run_test 60a "check mkfs.lustre --mkfsoptions -E -O options setting" + +test_60b() { + [[ "$mds1_FSTYPE" == ldiskfs ]] || skip "ldiskfs only test" + + local features=$(do_facet $SINGLEMDS $DUMPE2FS $(mdsdevname 1) | + grep features) + [ ${PIPESTATUS[0]} -eq 0 ] || error "$DUMPE2FS $(mdsdevname 1) failed" + + echo $features + # ea_inode feature should be enabled by default for MDTs + [[ "$features" =~ "ea_inode" ]] || error "ea_inode is not set" + # large_dir feature should be enabled by default for MDTs + [[ "$features" =~ "large_dir" ]] || error "large_dir is not set" +} +run_test 60b "check mkfs.lustre MDT default features" test_61a() { # LU-80 local lxattr=$(large_xattr_enabled) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 26f3f84..7338332 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -4734,14 +4734,11 @@ mkfs_opts() { opts+=${LDLM_TIMEOUT:+" --param=sys.ldlm_timeout=$LDLM_TIMEOUT"} if [ $type == MDS ]; then - opts+=${MDSCAPA:+" --param-mdt.capa=$MDSCAPA"} opts+=${DEF_STRIPE_SIZE:+" --param=lov.stripesize=$DEF_STRIPE_SIZE"} opts+=${DEF_STRIPE_COUNT:+" --param=lov.stripecount=$DEF_STRIPE_COUNT"} opts+=${L_GETIDENTITY:+" --param=mdt.identity_upcall=$L_GETIDENTITY"} if [ $fstype == ldiskfs ]; then - fs_mkfs_opts+="-O ea_inode,large_dir" - var=${facet}_JRN if [ -n "${!var}" ]; then fs_mkfs_opts+=" -J device=${!var}" @@ -4753,8 +4750,6 @@ mkfs_opts() { fi if [ $type == OST ]; then - opts+=${OSSCAPA:+" --param=ost.capa=$OSSCAPA"} - if [ $fstype == ldiskfs ]; then var=${facet}_JRN if [ -n "${!var}" ]; then -- 1.8.3.1