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

Test-Parameters:trivial serverjob=lustre-master serverbuildno=4516 testlist=replay-single,replay-ost-single,replay-dual,recovery-small,replay-vbr,sanity-pfl

Change-Id: Iab963ac10308b56a60508774c1a63bcdfffdba85
Fixes: 9ef186b71b ("LU-16692 tests: remove force_new_seq from some test suites")
Fixes: f00d2467fc ("LU-16692 osp: do not assert on seq got over network")
Signed-off-by: Li Dongyang <dongyangli@ddn.com>

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 24be100..4fc45eb 100755 (executable)
--- 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 < v2_15_61-226-gf00d2467fc
+if (( $MDS1_VERSION < $(version_code 2.15.61.226) )); 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 6e84f82..b4ca98b 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -47,6 +47,11 @@ CLIENT1=${CLIENT1:-$HOSTNAME}
 # Exception is the test which need two separate nodes
 CLIENT2=${CLIENT2:-$CLIENT1}
 
+# new sequence needed for MDS < v2_15_61-226-gf00d2467fc
+if (( $MDS1_VERSION < $(version_code 2.15.61.226) )); 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 1106c16..4a05816 100755 (executable)
--- 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 < v2_15_61-226-gf00d2467fc
+if (( $MDS1_VERSION < $(version_code 2.15.61.226) )); 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 e0e2092..bf22d56 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -31,6 +31,11 @@ mkdir -p $DIR
 assert_DIR
 rm -rf $DIR/[df][0-9]* $DIR/f.$TESTSUITE.*
 
+# new sequence needed for MDS < v2_15_61-226-gf00d2467fc
+if (( $MDS1_VERSION < $(version_code 2.15.61.226) )); 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 0541385..659f260 100755 (executable)
--- 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 < v2_15_61-226-gf00d2467fc
+if (( $MDS1_VERSION < $(version_code 2.15.61.226) )); 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 cc78292..c37ce79 100755 (executable)
--- a/lustre/tests/sanity-pfl.sh
+++ b/lustre/tests/sanity-pfl.sh
@@ -40,6 +40,11 @@ check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS
 assert_DIR
 rm -rf $DIR/[Rdfs][0-9]*
 
+# new sequence needed for MDS < v2_15_61-226-gf00d2467fc
+if (( $MDS1_VERSION < $(version_code 2.15.61.226) )); then
+       force_new_seq_all
+fi
+
 test_0a() {
        [ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs"