LU-17924 tests: disable obdfilter-survey for ZFS

Starting with ZFS 2.2.7 the obdfilter-survey test fails due to
memory exhausting. For now disable the test for ZFS.

Test-Parameters: trivial
Change-Id: Ibebc637a9b733cf0b262d18de1baeef09108cd36
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58796
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh
index 1e475cd..6c8c98b 100644 (file)
--- a/lustre/tests/obdfilter-survey.sh
+++ b/lustre/tests/obdfilter-survey.sh
@@ -8,7 +8,12 @@ init_logging
 
 # bug number for skipped test:
 ALWAYS_EXCEPT="$OBDFILTER_SURVEY_EXCEPT "
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
+
+# it would be nice to have an "all" option :-)
+ if [[ $mds1_FSTYPE == zfs ]] &&
+    (( $(zfs_version_code mds1) >= $(version_code 2.2.7) )); then
+       always_except LU-18889 1a 1b 1c 2a 2b 3a
+fi
 
 build_test_filter
 

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 9307da2..32b4249 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -817,6 +817,18 @@ lustre_version_code() {
        version_code $(lustre_build_version $1)
 }
 
+zfs_version_code() {
+       local facet=$1
+       local facet_version=${facet}_ZFS_VERSION
+
+       if [[ -z "${!facet_version}" ]]; then
+               local zfs_ver=$(do_facet $facet "modinfo --field version zfs")
+
+               export $facet_version=$(version_code ${zfs_ver%-*})
+       fi
+       echo ${!facet_version}
+}
+
 # Extract the server-side /etc/os-release information into local variables
 # usage: lustre_os_release <facet>
 # generates $facet_OS_ID, $facet_OS_ID_LIKE, $facet_VERSION_ID