From 971909e79ad72db339045053b19e7032bb8197e5 Mon Sep 17 00:00:00 2001
From: Li Dongyang <dongyangli@ddn.com>
Date: Thu, 18 Apr 2024 21:10:39 +1000
Subject: [PATCH] LU-16692 tests: force_new_seq_all interop version checking

force_new_seq_all is still needed in those test suites
if testing against servers don't have v2_15_61-226-gf00d2467fc

Lustre-change: https://review.whamcloud.com/54840
Lustre-commit: TBD (from 944c6d7017c08cc81d72b43cc4fc73a820111dd1)

Test-Parameters:trivial serverversion=EXA6.3.0 testlist=replay-single,replay-ost-single,replay-dual,recovery-small,replay-vbr,sanity-pfl

Change-Id: Iab963ac10308b56a60508774c1a63bcdfffdba85
Fixes: c0c664cac1 ("LU-16692 tests: remove force_new_seq from some test suites")
Fixes: 55a9dfb82d ("LU-16692 osp: do not assert on seq got over network")
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54841
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---
 lustre/tests/recovery-small.sh    | 5 +++++
 lustre/tests/replay-dual.sh       | 5 +++++
 lustre/tests/replay-ost-single.sh | 5 +++++
 lustre/tests/replay-single.sh     | 5 +++++
 lustre/tests/replay-vbr.sh        | 5 +++++
 lustre/tests/sanity-pfl.sh        | 5 +++++
 6 files changed, 30 insertions(+)

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index e3df682..ecd883a 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -28,6 +28,11 @@ check_and_setup_lustre
 assert_DIR
 rm -rf $DIR/d[0-9]* $DIR/f.${TESTSUITE}*
 
+# new sequence needed for MDS < 2.14.0-ddn143-11-g55a9dfb82d
+if (( $MDS1_VERSION <= $(version_code 2.14.0-ddn143) )); then
+	force_new_seq_all
+fi
+
 test_1() {
 	local f1="$DIR/$tfile"
 	local f2="$DIR/$tfile.2"
diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index ade13b1..6e6599e 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -53,6 +53,11 @@ if [ $LINUX_VERSION_CODE -lt $(version_code 2.6.33) ]; then
 	do_facet $SINGLEMDS "sync; sleep 10; sync; sleep 10; sync"
 fi
 
+# new sequence needed for MDS < 2.14.0-ddn143-11-g55a9dfb82d
+if (( $MDS1_VERSION <= $(version_code 2.14.0-ddn143) )); then
+	force_new_seq_all
+fi
+
 LU482_FAILED=$(mktemp -u $TMP/$TESTSUITE.lu482.XXXXXX)
 test_0a() {
 	echo "Check file is LU482_FAILED=$LU482_FAILED"
diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index 750b098..5ac33c9 100755
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -33,6 +33,11 @@ mkdir_on_mdt0 $TDIR
 $LFS setstripe $TDIR -i 0 -c 1
 $LFS getstripe $TDIR
 
+# new sequence needed for MDS < 2.14.0-ddn143-11-g55a9dfb82d
+if (( $MDS1_VERSION <= $(version_code 2.14.0-ddn143) )); then
+	force_new_seq_all
+fi
+
 test_0a() {
 	zconf_umount $(hostname) $MOUNT -f
 	# needs to run during initial client->OST connection
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index fe95d2e..8cbfa81 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -34,6 +34,11 @@ if [ $LINUX_VERSION_CODE -lt $(version_code 2.6.33) ]; then
     do_facet $SINGLEMDS sync
 fi
 
+# new sequence needed for MDS < 2.14.0-ddn143-11-g55a9dfb82d
+if (( $MDS1_VERSION <= $(version_code 2.14.0-ddn143) )); then
+	force_new_seq_all
+fi
+
 test_0a() {	# was test_0
 	mkdir_on_mdt0 $DIR/$tdir || error "mkdir $DIR/$tdir failed"
 	replay_barrier $SINGLEMDS
diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh
index 04065c3..ec634ec 100755
--- a/lustre/tests/replay-vbr.sh
+++ b/lustre/tests/replay-vbr.sh
@@ -71,6 +71,11 @@ chk_get_version() {
 cos_param_file=$TMP/rvbr-cos-params
 save_lustre_params $(get_facets MDS) "mdt.*.commit_on_sharing" > $cos_param_file
 
+# new sequence needed for MDS < 2.14.0-ddn143-11-g55a9dfb82d
+if (( $MDS1_VERSION <= $(version_code 2.14.0-ddn143) )); then
+	force_new_seq_all
+fi
+
 test_0a() {
 	local ver=$(get_version $CLIENT1 $DIR/$tdir/1a)
 
diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh
index 512130d..e2571e1 100644
--- a/lustre/tests/sanity-pfl.sh
+++ b/lustre/tests/sanity-pfl.sh
@@ -44,6 +44,11 @@ check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS
 assert_DIR
 rm -rf $DIR/[Rdfs][0-9]*
 
+# new sequence needed for MDS < 2.14.0-ddn143-11-g55a9dfb82d
+if (( $MDS1_VERSION <= $(version_code 2.14.0-ddn143) )); then
+	force_new_seq_all
+fi
+
 test_0a() {
 	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs"
 
-- 
1.8.3.1