LU-17312 tests: skip conf-sanity test_53 in interop

Skip conf-sanity test_53 in interop because older servers cannot
stop any running service threads above threads_max.

Remove old test interop for servers < 2.3.

Lustre-change: https://review.whamcloud.com/53226
Lustre-commit: TBD (from d029a1cb45ac440e580c177866f0e9766444d8f1)

Test-Parameters: trivial testlist=conf-sanity
Test-Parameters: testlist=conf-sanity env=ONLY=53 serverversion=EXA5
Fixes: 183cb1e3cd ("LU-947 ptlrpc: allow stopping threads above threads_max")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ia95405060c607c7a070720ed32a7a43b1c3ebbe5
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/53227
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alex Deiter <alex.deiter@gmail.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 7684d53..72d2d86 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4351,6 +4351,11 @@ thread_sanity() {
        # Restore previous setting of MODOPTS_*
        setmodopts $modname "$oldvalue"
 
+       (( $MDS1_VERSION > $(version_code 2.12.52.91) )) || {
+               echo "skip interop for MDS < v2_12_52-91-g183cb1e3cdd2"
+               return 0
+       }
+
        # Check that $opts took
        tmin=$(do_facet $facet "$LCTL get_param -n ${paramp}.threads_min" ||
                echo 0)
@@ -4360,9 +4365,6 @@ thread_sanity() {
                   "$LCTL get_param -n ${paramp}.threads_started" || echo 0)
        lassert 28 "$msg" '(($tstarted >= $tmin && $tstarted <= $tmax ))' ||
                return $?
-       cleanup
-
-       setup
 }
 
 test_53a() {
@@ -4374,14 +4376,7 @@ run_test 53a "check OSS thread count params"
 
 test_53b() {
        setup
-       local mds=$(do_facet $SINGLEMDS "$LCTL get_param \
-                                        -N mds.*.*.threads_max 2>/dev/null")
-       if [ -z "$mds" ]; then
-               #running this on an old MDT
-               thread_sanity MDT $SINGLEMDS 'mdt.*.*.' 'mdt_num_threads' 16
-       else
-               thread_sanity MDT $SINGLEMDS 'mds.*.*.' 'mds_num_threads' 16
-       fi
+       thread_sanity MDT $SINGLEMDS 'mds.*.*.' 'mds_num_threads' 16
        cleanup || error "cleanup failed with $?"
 }
 run_test 53b "check MDS thread count params"