From: Andreas Dilger Date: Fri, 10 Feb 2017 00:42:33 +0000 (-0700) Subject: LU-8582 tests: skip sanity test_255a for interop X-Git-Tag: 2.9.54~5 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=35958f8c07beb7cff0763232c1aa16f0080ec38f LU-8582 tests: skip sanity test_255a for interop Move the sanity.sh test_255a version check to the start of the test instead of after some of the ladvise functionality is tested. That said, there is still an issue here, because the client shouldn't hang indefinitely if the server is returning -EOPNOTSUPP, in the case where a new client/lfs is connecting to an old OSS, and that issue is not addressed by this patch. Signed-off-by: Andreas Dilger Change-Id: If1fbc13bd60cfc1942a43aff40e3e7905cdcab07 Reviewed-on: https://review.whamcloud.com/25362 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Saurabh Tandan Reviewed-by: Bob Glossman Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index eb9f862..0b08267 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -14335,6 +14335,9 @@ ladvise_willread_performance() } test_255a() { + [ $(lustre_version_code ost1) -lt $(version_code 2.8.54) ] && + skip "lustre < 2.8.54 does not support ladvise " && return + lfs setstripe -c -1 -i 0 $DIR/$tfile || error "$tfile failed" ladvise_no_type willread $DIR/$tfile && @@ -14343,9 +14346,6 @@ test_255a() { ladvise_no_ioctl $DIR/$tfile && skip "ladvise ioctl is not supported" && return - [ $(lustre_version_code ost1) -lt $(version_code 2.8.54) ] && - skip "lustre < 2.8.54 does not support ladvise " && return - local size_mb=100 local size=$((size_mb * 1048576)) dd if=/dev/zero of=$DIR/$tfile bs=1048576 count=$size_mb ||