From: Qian Yingjin <qian@ddn.com>
Date: Mon, 14 Oct 2024 02:43:31 +0000 (+0800)
Subject: LU-18330 tests: add interop PCCRO check for sanity-pcc/test_35
X-Git-Tag: 2.16.0-RC3~4
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F56675%2F4;p=fs%2Flustre-release.git

LU-18330 tests: add interop PCCRO check for sanity-pcc/test_35

Add interop PCCRO connection flag check for sanity-pcc/
test_{35,36}.
Fix the interop sanity-pcc tests with b2_15.

Test-Parameters: trivial serverversion=2.15.5 testlist=sanity-pcc
Test-Parameters: trivial testlist=sanity-pcc env=ONLY=36b,ONLY_REPEAT=100
Signed-off-by: Qian Yingjin <qian@ddn.com>
Change-Id: I9174752bf123abf608a2d3e1f72650cf08e7146e
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56675
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/sanity-pcc.sh b/lustre/tests/sanity-pcc.sh
index e825cb6..eca79a1 100755
--- a/lustre/tests/sanity-pcc.sh
+++ b/lustre/tests/sanity-pcc.sh
@@ -2979,6 +2979,9 @@ test_35() {
 	local file=$DIR/$tfile
 	local -a lpcc_path
 
+	$LCTL get_param -n mdc.*.connect_flags | grep -q pcc_ro ||
+		skip "Server does not support PCC-RO"
+
 	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
 	setup_pcc_mapping
@@ -3014,6 +3017,9 @@ test_36_base() {
 	local state="readonly"
 	local rw="$1"
 
+	$LCTL get_param -n mdc.*.connect_flags | grep -q pcc_ro ||
+                skip "Server does not support PCC-RO"
+
 	[[ -z $rw ]] || state="readwrite"
 	setup_loopdev $SINGLEAGT $loopfile $mntpt 50
 	copytool setup -m "$MOUNT" -a "$HSM_ARCHIVE_NUMBER"
@@ -3041,9 +3047,6 @@ test_36a() {
 run_test 36a "Stale RW-PCC copy should be deleted after remove the PCC backend"
 
 test_36b() {
-	$LCTL get_param -n mdc.*.connect_flags | grep -q pcc_ro ||
-		skip "Server does not support PCC-RO"
-
 	test_36_base
 }
 run_test 36b "Stale RO-PCC copy should be deleted after remove the PCC backend"