From 32c219578bf3019076498eafbee6480b0adbb408 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 6 Mar 2023 18:11:01 -0700 Subject: [PATCH] LU-15542 tests: skip interop conf-sanity test_61b Skip large_xattr test for old MDS without fix for large_xattr. Minor cleanup to code style. Test-Parameters: trivial Test-Parameters: testlist=conf-sanity env=ONLY="61" serverversion=2.15.0 Fixes: 716de353b7 ("LU-15542 osd-ldiskfs: exclude EA inode from processing") Signed-off-by: Andreas Dilger Change-Id: Ieb30568b617177a9986a139b289ba1ced63ebbe5 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50222 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Sarah Liu Reviewed-by: Alex Deiter Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 965699d..b6dd545 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -5101,14 +5101,13 @@ run_test 60b "check mkfs.lustre MDT default features" test_61a() { # LU-80 local lxattr=$(large_xattr_enabled) - [ "$MDS1_VERSION" -ge $(version_code 2.1.53) ] || - skip "Need MDS version at least 2.1.53" + (( "$MDS1_VERSION" >= $(version_code 2.1.53) )) || + skip "Need MDS version at least 2.1.53 for large_xattr" - if [ "$mds1_FSTYPE" == ldiskfs ] && - ! large_xattr_enabled; then + if [[ "$mds1_FSTYPE" == ldiskfs ]] && ! large_xattr_enabled; then lxattr=true - for num in $(seq $MDSCOUNT); do + for ((num=1; num <= $MDSCOUNT; num++)); do do_facet mds${num} $TUNE2FS -O ea_inode \ $(mdsdevname $num) || error "tune2fs on mds $num failed" @@ -5177,17 +5176,15 @@ run_test 61a "large xattr" test_61b() { # LU-80 local lxattr=$(large_xattr_enabled) - [ "$MDS1_VERSION" -ge $(version_code 2.1.53) ] || - skip "Need MDS version at least 2.1.53" + (( $MDS1_VERSION >= $(version_code 2.15.51) )) || + skip "Need MDS version at least 2.15.51 for large_xattr fix" - if [ "$mds1_FSTYPE" != ldiskfs ]; then - skip "ldiskfs specific bug" - fi + [[ "$mds1_FSTYPE" == "ldiskfs" ]] || skip "ldiskfs specific bug" if ! large_xattr_enabled; then lxattr=true - for num in $(seq $MDSCOUNT); do + for (( num=1; num <= $MDSCOUNT; num++ )); do do_facet mds${num} $TUNE2FS -O ea_inode \ $(mdsdevname $num) || error "tune2fs on mds $num failed" -- 1.8.3.1