From b0bbd61f8d7411560b6aa4ae84b8c680d7bd5c3d Mon Sep 17 00:00:00 2001 From: James Simmons Date: Thu, 10 Apr 2025 11:32:10 -0400 Subject: [PATCH] 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 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58796 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Alex Zhuravlev Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/obdfilter-survey.sh | 7 ++++++- lustre/tests/test-framework.sh | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh index 1e475cd..6c8c98b 100644 --- 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 --- 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 # generates $facet_OS_ID, $facet_OS_ID_LIKE, $facet_VERSION_ID -- 1.8.3.1