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 <adilger@whamcloud.com>
Change-Id: I33be173c98faa61311ab2b435555cf49e1e2bacc
Reviewed-on: https://review.whamcloud.com/40761
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Lai Siyao <lai.siyao@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index 4706337..a5728af 100644 (file)
--- 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
 
 init_test_env $@
 init_logging
 

+# bug number for skipped test:

 ALWAYS_EXCEPT="$SANITY_LFSCK_EXCEPT "
 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) ]] &&
 # 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"
        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
 
 [ "$SLOW" = "no" ] && EXCEPT_SLOW=""
 build_test_filter