From 513542bebc8444a96d5c4ee341bee532cff27a1b Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 29 Jan 2024 14:54:03 -0700 Subject: [PATCH] EX-7601 tests: skip sanity-compr tests in interop Skip a number of subtests in sanity-compr that depend on fixes landed to the code that were not available in older versions. Test-Parameters: trivial testlist=sanity-compr serverversion=EXA6.3.0 Fixes: 3e1dd9d6ae ("LU-17468 lod: component add missed pattern info") Fixes: 7731c7fc74 ("EX-7601 tests: unaligned read tests") Fixes: 033dd0ba2c ("EX-7644 mmap: add mmap support for compression") Fixes: 46708e4636 ("EX-7601 tests: tests for read-modify-write") Fixes: 6c4c4d7599 ("EX-7601 tests: add multi-mount compression test") Signed-off-by: Andreas Dilger Change-Id: I26cae5cf01cc32c9f3e4386cf7151a66ac3678ea Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/53852 Reviewed-by: Patrick Farrell Reviewed-by: Jian Yu Tested-by: jenkins Tested-by: Maloo --- lustre/tests/sanity-compr.sh | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/lustre/tests/sanity-compr.sh b/lustre/tests/sanity-compr.sh index 382fef6..75a539c 100644 --- a/lustre/tests/sanity-compr.sh +++ b/lustre/tests/sanity-compr.sh @@ -122,6 +122,9 @@ test_0b() { run_test 0b "compression types negotiation between client and MDT" test_1a() { + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn132) )) || + skip "need MDS > 2.14.0-ddn131-15-g3e1dd9d6ae for comp add" + local tf=$DIR/$tfile stack_trap "rm -f $tf; disable_compression" enable_compression @@ -244,6 +247,8 @@ run_test 1000 "compressed vs uncompressed allocation" test_fsx() { [[ "$ost1_FSTYPE" == "ldiskfs" ]] || skip "need ldiskfs backend" + (( $OST1_VERSION >= $(version_code 2.14.0-ddn122) )) || + skip "Need MDS >= 2.14.0-ddn121-12-g7731c7fc74 for partial read" local osts=$(comma_list $(osts_nodes)) local dense=$(do_facet ost1 lctl get_param -n \ @@ -268,8 +273,8 @@ test_fsx() { run_test fsx "verify dense writes with fsx on ldiskfs" test_1001() { - (( MDS1_VERSION >= $(version_code 2.14.0.91) )) || - skip "Need MDS version at least 2.14.0.91" + (( $OST1_VERSION >= $(version_code 2.14.0-ddn122) )) || + skip "Need MDS >= 2.14.0-ddn121-12-g7731c7fc74 for partial read" local tf=$DIR/$tfile # We read from $tfile to this @@ -364,8 +369,8 @@ test_1001() { run_test 1001 "test partial chunk reads" test_1002() { - (( MDS1_VERSION >= $(version_code 2.14.0.91) )) || - skip "Need MDS version at least 2.14.0.91" + (( $OST1_VERSION >= $(version_code 2.14.0-ddn122) )) || + skip "Need MDS >= 2.14.0-ddn121-12-g7731c7fc74 for partial read" local tf=$DIR/$tfile # Larger than arm page size @@ -494,8 +499,8 @@ test_1002() { run_test 1002 "test reads with incomplete chunks" test_1003() { - (( MDS1_VERSION >= $(version_code 2.14.0.91) )) || - skip "Need MDS version at least 2.14.0.91" + (( $OST1_VERSION >= $(version_code 2.14.0-ddn126) )) || + skip "Need OST >= 2.14.0-ddn125-6-g033dd0ba2c for mmap compr" local tf=$DIR/$tfile local hdf=$LUSTRE/tests/AMSR_E_L3_DailyOcean_V05_20111003.hdf @@ -596,8 +601,8 @@ test_1003() { run_test 1003 "mmap test for compression" test_1004() { - (( MDS1_VERSION >= $(version_code 2.14.0.91) )) || - skip "Need MDS version at least 2.14.0.91" + (( $OST1_VERSION >= $(version_code 2.14.0-ddn128) )) || + skip "Need OST >= 2.14.0-ddn127-8-g46708e4636 for partial compr" local tf=$DIR/$tfile local hdf=$LUSTRE/tests/AMSR_E_L3_DailyOcean_V05_20111003.hdf @@ -673,8 +678,8 @@ test_1004() { run_test 1004 "initial test for write updating" test_1005() { - (( MDS1_VERSION >= $(version_code 2.14.0.91) )) || - skip "Need MDS version at least 2.14.0.91" + (( $OST1_VERSION >= $(version_code 2.14.0-ddn128) )) || + skip "Need OST >= 2.14.0-ddn127-8-g46708e4636 for partial compr" local tf=$DIR/$tfile # We read from $tfile to this @@ -842,6 +847,9 @@ test_1005() { run_test 1005 "test for write updating with partial chunks" test_1006() { + (( $OST1_VERSION >= $(version_code 2.14.0.128) )) || + skip "Need OST >= 2.14.0-ddn127-9-g6c4c4d7599 for partial compr" + local tf=$DIR/$tfile local tf2=$DIR2/$tfile local hdf=$LUSTRE/tests/AMSR_E_L3_DailyOcean_V05_20111003.hdf @@ -913,8 +921,8 @@ test_1006() { run_test 1006 "racing writes with compressed layout" test_1007() { - (( MDS1_VERSION >= $(version_code 2.14.0-ddn128) )) || - skip "Need MDS version at least 2.14.0-ddn128" + (( $OST1_VERSION >= $(version_code 2.14.0-ddn128) )) || + skip "Need OST >= 2.14.0-ddn127-9-g6c4c4d7599 for good compr" # The ll_compression_scan tool requires the lz4, lzop, and gzip # utilities to be installed in order to test those compression types. -- 1.8.3.1