From f63cf0ea3879fe6feb04c7badeeddb94c855ab04 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 18 Aug 2023 21:55:10 +0000 Subject: [PATCH] LU-16097 tests: skip quota subtests in interop Skip subtests in sanity-quota.sh to avoid interop test failures, backdated to check all new tests since 2.14.0 for completeness. Test-Parameters: trivial testlist=sanity-quota serverversion=EXA6.1.0 Fixes: 513b1cdbca ("LU-16340 quota: notify only global lqe") Fixes: d4978678b4 ("LU-15694 quota: keep grace time while setting default") Fixes: 25a70a88c9 ("LU-13952 quota: default OST Pool Quotas") Fixes: 188112fc80 ("LU-14300 quota: avoid nested lqe lookup") Fixes: 8c19365416 ("LU-13971 quota: report Pool Quotas for a user") Fixes: a4fbe7341b ("LU-14739 quota: nodemap squashed root cannot bypass quota") Fixes: 789038c97a ("LU-15167 quota: fallocate send UID/GID for quota") Fixes: c9901b68b4 ("LU-13587 quota: protect qpi in proc") Fixes: 61ec1e0f2c ("LU-15031 quota: reseed glbe in qmt_lvbo_udate") Fixes: dfe7d2dd2b ("LU-16341 quota: fix panic in qmt_site_recalc_cb") Fixes: 862f0baa7c ("LU-15097 quota: stop pool_recalc before killing pool") Fixes: 61481796ac ("LU-15193 quota: expand QUOTA_MAX_TRANSIDS to 12") Fixes: a2fd4d3aee ("LU-15880 quota: fix insane grant quota") Signed-off-by: Andreas Dilger Signed-off-by: Sergey Cheremencev Change-Id: Ife8bfd83d0f217c534f3b12b4c9d108d370ed6b7 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52009 Tested-by: jenkins Tested-by: Maloo Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/52582 --- lustre/tests/sanity-quota.sh | 57 +++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 075c43d..b5dabc5 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -2542,8 +2542,8 @@ run_test 13 "Cancel per-ID lock in the LRU list" test_14() { - (( MDS1_VERSION >= $(version_code 2.14.0.87) )) || - skip "Need MDS version at least 2.14.0.87" + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn87) )) || + skip "Need MDS >= 2.14.0-ddn87-gd965d6341 for qmt_site_recalc_cb fix" local qpool="qpool1" local tfile1="$DIR/$tdir/$tfile-0" @@ -3134,6 +3134,9 @@ run_test 24 "lfs draws an asterix when limit is reached (b16646)" test_25() { + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn93) )) || + skip "need MDS >= 2.14.0-ddn93-ge43a97b64 for index version fix" + local limit=10 # 10M local testfile="$DIR/$tdir/$tfile-0" local qpool="qpool1" @@ -3247,7 +3250,11 @@ test_27d() { } run_test 27d "lfs setquota should support fraction block limit" -test_30() { +test_30() +{ + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn60) )) || + skip "need MDS >= 2.14.0-ddn60-gbba7d696d for grace time fix" + local LIMIT=4 # MB local TESTFILE="$DIR/$tdir/$tfile" local GRACE=10 @@ -5184,6 +5191,9 @@ run_test 72 "lfs quota --pool prints only pool's OSTs" test_73a() { + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn20) )) || + skip "need MDS >= 2.14.0-ddn20-g2c9002448 for default pool quota" + local qpool="qpool1" mds_supports_qp @@ -5198,6 +5208,9 @@ run_test 73a "default limits at OST Pool Quotas" test_73b() { + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn20) )) || + skip "need MDS >= 2.14.0-ddn20-gbff894d1c for nested lqe fix" + local TESTFILE1="$DIR/$tdir/$tfile-1" local limit=20 #20M local qpool="qpool1" @@ -5312,6 +5325,9 @@ test_dom_75() { test_75() { + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn66) )) || + skip "need MDS >= 2.14.0-ddn66-g598a1e418 for squash root fix" + local soft_limit=10 # MB local hard_limit=20 # MB local limit=$soft_limit @@ -5438,10 +5454,10 @@ test_77() } run_test 77 "lfs setquota should fail in Lustre mount with 'ro'" -test_78() +test_78A() { - (( $OST1_VERSION >= $(version_code 2.14.0.31) )) || - skip "need OST at least 2.14.0.31" + (( $OST1_VERSION >= $(version_code 2.14.0-ddn31) )) || + skip "need OST >= 2.14.0-ddn31-g9abc60b67 for fallocate fix" check_set_fallocate_or_skip setup_quota_test || error "setup quota failed with $?" @@ -5478,14 +5494,10 @@ test_78() (( $kbytes >= $expect_lo && $kbytes <= $expect_hi )) || error "fallocate did not use quota correctly" } -run_test 78 "Check fallocate increase quota usage" +run_test 78A "Check fallocate increase quota usage" test_78a() { - (( $CLIENT_VERSION >= $(version_code 2.14.0.93) )) || - skip "need client at least 2.14.0.93" - (( $OST1_VERSION >= $(version_code 2.14.0.93) )) || - skip "need OST at least 2.14.0.93" check_set_fallocate_or_skip setup_quota_test || error "setup quota failed with $?" @@ -5529,6 +5541,9 @@ run_test 78a "Check fallocate increase projectid usage" test_79() { + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn39) )) || + skip "need MDS >= 2.14.0-ddn39-gd99b95617 for pool panic fix" + local qpool="qpool1" local cmd="$LCTL get_param -n qmt.$FSNAME-QMT0000.dt-$qpool.info" local stopf=$TMP/$tfile @@ -5545,6 +5560,9 @@ run_test 79 "access to non-existed dt-pool/info doesn't cause a panic" test_80() { + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn65) )) || + skip "need MDS >= 2.14.0-ddn65-g3074aac49 for EDQUOT failover" + local dir1="$DIR/$tdir/dir1" local dir2="$DIR/$tdir/dir2" local TESTFILE0="$dir1/$tfile-0" @@ -5620,7 +5638,11 @@ test_80() } run_test 80 "check for EDQUOT after OST failover" -test_81() { +test_81() +{ + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn65) )) || + skip "need MDS >= 2.14.0-ddn65-gec44ddf38 for qmt_pool_free fix" + local global_limit=20 # 100M local testfile="$DIR/$tdir/$tfile-0" local qpool="qpool1" @@ -5683,6 +5705,8 @@ test_grace_with_default_quota() test_82() { + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn103) )) || + skip "need MDS >= 2.14.0-ddn103-gd412393b7 for over 8 QIDs fix" (( $MDS1_VERSION >= $(version_code 2.14.0.102) )) || skip "need MDS 2.14.0.102 or later" is_project_quota_supported || @@ -5714,6 +5738,9 @@ run_test 82 "verify more than 8 qids for single operation" test_83() { + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn60) )) || + skip "need MDS >= 2.14.0-ddn60-gbba7d696d for grace time fix" + setup_quota_test || error "setup quota failed with $?" test_grace_with_default_quota "-u" "-U" test_grace_with_default_quota "-g" "-G" @@ -5725,8 +5752,10 @@ run_test 83 "Setting default quota shouldn't affect grace time" test_84() { - (( $MDS1_VERSION >= $(version_code 2.14.0.74) )) || - skip "need MDS 2.14.0.74 or later" + (( $MDS1_VERSION >= $(version_code 2.14.0-ddn77) )) || + skip "need MDS >= v2_15_53-115-g7e94c9f30 for insane quota fix" + (( $OST1_VERSION >= $(version_code 2.14.0-ddn77) )) || + skip "need OSS >= v2_15_53-115-g7e94c9f30 for insane quota fix" local dir1="$DIR/$tdir/dir1" local TESTFILE1="$dir1/$tfile-1" -- 1.8.3.1