From 8ed22b88a46197a91d62c435a74577864cb66ce7 Mon Sep 17 00:00:00 2001 From: Qian Yingjin Date: Mon, 14 Oct 2024 10:43:31 +0800 Subject: [PATCH] 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 Change-Id: I9174752bf123abf608a2d3e1f72650cf08e7146e Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56675 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre/tests/sanity-pcc.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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" -- 1.8.3.1