From: Andreas Dilger Date: Wed, 25 Nov 2020 23:20:19 +0000 (-0700) Subject: LU-5855 tests: enable skipped sanity-lfsck DNE ZFS tests X-Git-Tag: 2.13.57~9 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=fc61ddc252156cef5a21cefd82362bcdd77f3a51 LU-5855 tests: enable skipped sanity-lfsck DNE ZFS tests LFSCK has been enabled for DNE striped directories on ZFS for some time, but the skipped tests have never been enabled for this configuration. Re-enable them for ZFS backends. Fixes: 26995a3588e7 ("LU-5855 lfsck: misc fixes for zfs-based backend") Test-Parameters: trivial fstype=zfs testlist=sanity-lfsck Test-Parameters: fstype=zfs mdscount=2 mdtcount=4 testlist=sanity-lfsck Signed-off-by: Andreas Dilger Change-Id: I33be173c98faa61311ab2b435555cf49e1e2bacc Reviewed-on: https://review.whamcloud.com/40761 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Lai Siyao Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh index 4706337..a5728af 100644 --- a/lustre/tests/sanity-lfsck.sh +++ b/lustre/tests/sanity-lfsck.sh @@ -13,15 +13,8 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} init_test_env $@ init_logging +# bug number for skipped test: ALWAYS_EXCEPT="$SANITY_LFSCK_EXCEPT " - -# DNE does not support striped directory on zfs-based backend yet. -[ $(facet_fstype $SINGLEMDS) != ldiskfs ] && - -# bug number for skipped test: LU-5855 LU-5855 LU-5855 LU-5855 - ALWAYS_EXCEPT+=" 31a 31b 31c 31d" -# bug number for skipped test: LU-5855 LU-5855 LU-5855 LU-5855 - ALWAYS_EXCEPT+=" 31e 31f 31g 31h" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! [[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.4.90) ]] && @@ -71,10 +64,6 @@ ALWAYS_EXCEPT="$SANITY_LFSCK_EXCEPT " ALWAYS_EXCEPT+=" 29a 29b 29c" # bug number for skipped test: LU-5518 ALWAYS_EXCEPT+=" 30" -# bug number for skipped test: LU-5519 LU-5519 LU-5519 LU-5519 - ALWAYS_EXCEPT+=" 31a 31b 31c 31d" -# bug number for skipped test: LU-5519 LU-5519 LU-5519 LU-5519 - ALWAYS_EXCEPT+=" 31e 31f 31g 31h" [ "$SLOW" = "no" ] && EXCEPT_SLOW="" build_test_filter