From 85716980de7c83a8d8eeb255bf24d9e0a972baf9 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Tue, 21 May 2024 10:35:48 +1000 Subject: [PATCH] LU-13577 tests: fix interop checking for intent_mkdir tests Use the correct interop version for replay-single/137a|b|c sanity/852, sanityn/116 Change-Id: I0b7fc03c542574dfb468a17719a6be81d738c5b3 Fixes: 668dfb53de ("LU-13577 wbc: reimplement mkdir() by using intent lock") Test-Parameters: trivial Test-Parameters: serverjob=lustre-master serverbuildno=4524 testlist=replay-single env=ONLY="137a 137b 137c" Test-Parameters: serverjob=lustre-master serverbuildno=4524 testlist=sanity env=ONLY=852 Test-Parameters: serverjob=lustre-master serverbuildno=4524 testlist=sanityn env=ONLY=116 Signed-off-by: Li Dongyang Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55161 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Qian Yingjin Reviewed-by: Oleg Drokin --- lustre/tests/replay-single.sh | 12 ++++++------ lustre/tests/sanity.sh | 4 ++-- lustre/tests/sanityn.sh | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index e9cad60..a3212e4 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -5088,8 +5088,8 @@ check_striped_create_137() { test_137a() { (( $MDSCOUNT >= 2 )) || skip "needs >= 2 MDTs" - (( $MDS1_VERSION >= $(version_code 2.15.61) )) || - skip "Need MDS >= 2.15.61 for intent mkdir" + (( $MDS1_VERSION >= $(version_code v2_15_62-70-g668dfb53de) )) || + skip "Need MDS >= 2.15.62.70 for intent mkdir" [[ $FAILURE_MODE != "HARD" ]] || [[ "$(facet_host mds1)" != "$(facet_host mds2)" ]] || @@ -5115,8 +5115,8 @@ run_test 137a "DNE: create under striped dir, fail MDT1" test_137b() { (( $MDSCOUNT >= 2 )) || skip "needs >= 2 MDTs" - (( $MDS1_VERSION >= $(version_code 2.15.61) )) || - skip "Need MDS version at least 2.15.61 for intent mkdir" + (( $MDS1_VERSION >= $(version_code v2_15_62-70-g668dfb53de) )) || + skip "Need MDS version at least 2.15.62.70 for intent mkdir" [[ $FAILURE_MODE != "HARD" ]] || [[ "$(facet_host mds1)" != "$(facet_host mds2)" ]] || @@ -5144,8 +5144,8 @@ run_test 137b "DNE: create under striped dir, fail MDT2" test_137c() { (( $MDSCOUNT >= 2 )) || skip "needs >= 2 MDTs" - (( $MDS1_VERSION >= $(version_code 2.15.61) )) || - skip "Need MDS version at least 2.15.61 for intent mkdir" + (( $MDS1_VERSION >= $(version_code v2_15_62-70-g668dfb53de) )) || + skip "Need MDS version at least 2.15.62.70 for intent mkdir" [[ $FAILURE_MODE != "HARD" ]] || [[ "$(facet_host mds1)" != "$(facet_host mds2)" ]] || diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index e7fbfa6..9ae3722 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -32879,8 +32879,8 @@ run_test 851 "fanotify can monitor open/read/write/close events for lustre fs" test_852() { (( $MDSCOUNT >= 2 )) || skip "needs >= 2 MDTs" - (( $MDS1_VERSION >= $(version_code 2.15.61) )) || - skip "Need MDS version at least 2.15.61 for intent mkdir" + (( $MDS1_VERSION >= $(version_code v2_15_62-70-g668dfb53de) )) || + skip "Need MDS version at least 2.15.62.70 for intent mkdir" local save="$TMP/$TESTSUITE-$TESTNAME.parameters" diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index 896dce9..ba1db2d 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -6710,8 +6710,8 @@ run_test 115 "ldiskfs doesn't check direntry for uniqueness" test_116() { (( $MDSCOUNT >= 2 )) || skip "needs >= 2 MDTs" - (( $MDS1_VERSION >= $(version_code 2.15.61) )) || - skip "Need MDS version at least 2.15.61 for intent mkdir" + (( $MDS1_VERSION >= $(version_code v2_15_62-70-g668dfb53de) )) || + skip "Need MDS version at least 2.15.62.70 for intent mkdir" local mdt_idx local save="$TMP/$TESTSUITE-$TESTNAME.parameters" -- 1.8.3.1