From 1fceff05d85d41c104b44995ebd3bf4075df4126 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Fri, 24 Nov 2023 00:34:20 -0700 Subject: [PATCH] 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. Test-Parameters: trivial testlist=conf-sanity Test-Parameters: testlist=conf-sanity env=ONLY=53 serverversion=2.12 Fixes: 183cb1e3cd ("LU-947 ptlrpc: allow stopping threads above threads_max") Signed-off-by: Andreas Dilger Change-Id: Ia95405060c607c7a070720ed32a7a43b1c3ebbe5 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53226 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Alex Deiter Reviewed-by: Sarah Liu Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index a9efe897..f0d1066 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -4830,6 +4830,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) @@ -4839,9 +4844,6 @@ thread_sanity() { "$LCTL get_param -n ${paramp}.threads_started" || echo 0) lassert 28 "$msg" '(($tstarted >= $tmin && $tstarted <= $tmax ))' || return $? - cleanup - - setup } test_53a() { @@ -4853,14 +4855,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" -- 1.8.3.1