From 2d2a83f1445391c90bfc94327f825fd17ee9a00b Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Sun, 30 Apr 2023 21:05:15 -0600 Subject: [PATCH 1/1] LU-3080 misc: remove checks for pre-3.10 kernels The oldest supported client kernel is el7.9 3.10.x, and even that is old, so no need to keep checks for 2.6.x kernel versions around. Test-Parameters: trivial testlist=replay-dual Test-Parameters: testlist=replay-single Test-Parameters: testlist=sanity-flr env=ONLY=50d Signed-off-by: Andreas Dilger Change-Id: I0db781c048334e6ef6df102b100d29e13c64fd25 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50814 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Alex Deiter Reviewed-by: Oleg Drokin --- lustre/tests/replay-dual.sh | 6 ------ lustre/tests/replay-single-lmv.sh | 6 ------ lustre/tests/replay-single.sh | 6 ------ lustre/tests/sanity-flr.sh | 2 -- 4 files changed, 20 deletions(-) diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index 2282931..a3c15d4 100755 --- a/lustre/tests/replay-dual.sh +++ b/lustre/tests/replay-dual.sh @@ -47,12 +47,6 @@ CLIENT1=${CLIENT1:-$HOSTNAME} # Exception is the test which need two separate nodes CLIENT2=${CLIENT2:-$CLIENT1} -# LU-482 Avert LVM and VM inability to flush caches in pre .33 kernels -if [ $LINUX_VERSION_CODE -lt $(version_code 2.6.33) ]; then - sync - do_facet $SINGLEMDS "sync; sleep 10; sync; sleep 10; sync" -fi - force_new_seq_all LU482_FAILED=$(mktemp -u $TMP/$TESTSUITE.lu482.XXXXXX) diff --git a/lustre/tests/replay-single-lmv.sh b/lustre/tests/replay-single-lmv.sh index d77fd89..3a97a21 100755 --- a/lustre/tests/replay-single-lmv.sh +++ b/lustre/tests/replay-single-lmv.sh @@ -32,12 +32,6 @@ fi mkdir -p $DIR -# LU-482 Avert LVM and VM inability to flush caches in pre .33 kernels -if [ $LINUX_VERSION_CODE -lt $(version_code 2.6.33) ]; then - sync - do_facet $SINGLEMDS sync -fi - force_new_seq_all test_0() { diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index 1e1b236..5f469ed 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -31,12 +31,6 @@ mkdir -p $DIR assert_DIR rm -rf $DIR/[df][0-9]* $DIR/f.$TESTSUITE.* -# LU-482 Avert LVM and VM inability to flush caches in pre .33 kernels -if [ $LINUX_VERSION_CODE -lt $(version_code 2.6.33) ]; then - sync - do_facet $SINGLEMDS sync -fi - force_new_seq_all test_0a() { # was test_0 diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh index 1ba3dd5..3595ad3 100644 --- a/lustre/tests/sanity-flr.sh +++ b/lustre/tests/sanity-flr.sh @@ -2973,8 +2973,6 @@ run_test 50c "punch_hole/mmap_write stale other mirrors" test_50d() { $LCTL get_param osc.*.import | grep -q 'connect_flags:.*seek' || skip "OST does not support SEEK_HOLE" - (( $LINUX_VERSION_CODE > $(version_code 3.0.0) )) || - skip "client kernel does not support SEEK_HOLE" [ "$FSTYPE" != "zfs" ] || skip "lseek for ZFS is not accurate if obj is not committed" -- 1.8.3.1