From 0f157f5de1b5e26bbc6be5c227f0c489f3c5c5fb Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Sun, 14 Apr 2024 01:49:46 -0600 Subject: [PATCH] LU-17497 tests: skip sanity-sec/69 for old MDS Older MDS versions do not have strict checking for identity_upcall or rsi_upcall, don't run the test with those servers. Lustre-change: https://review.whamcloud.com/54782 Lustre-commit: TBD (from 57b39fb5fecc895dc220835789d6011479bdd4db) Test-Parameters: trivial testlist=sanity-sec env=ONLY=69 serverversion=2.15 Fixes: a462a119ec ("LU-17497 obdclass: check upcall incorrect values") Signed-off-by: Andreas Dilger Change-Id: Icdfda82eca32c2de7e88991ead0d9723023ebbe5 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54783 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Zhenyu Xu --- lustre/tests/sanity-sec.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index 4b32450..e0c914b 100755 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -6375,6 +6375,11 @@ test_69() { local param local orig + (( MDS1_VERSION >= $(version_code 2.14.0-ddn141-8-ga462a119ec) && + MDS1_VERSION < $(version_code 2.15.0) )) || + (( MDS1_VERSION >= $(version_code v2_15_61-210-g2153e86541) )) || + skip "need MDS >= 2.15.61.210 for upcall sanity checking" + param="mdt.$mdt.identity_upcall" orig="$(do_facet mds1 "$LCTL get_param -n $param")" stack_trap "do_facet mds1 $LCTL set_param $param=$orig" EXIT @@ -6389,10 +6394,13 @@ test_69() { error "set_param $param=NONE failed" do_facet mds1 $LCTL set_param $param=none || error "set_param $param=none failed" - do_facet mds1 $LCTL set_param $param=INTERNAL || - error "set_param $param=INTERNAL failed" - do_facet mds1 $LCTL set_param $param=internal || - error "set_param $param=internal failed" + # INTERNAL upcall is not on master yet + if (( MDS1_VERSION < $(version_code 2.15.0) )); then + do_facet mds1 $LCTL set_param $param=INTERNAL || + error "set_param $param=INTERNAL failed" + do_facet mds1 $LCTL set_param $param=internal || + error "set_param $param=internal failed" + fi if $GSS; then param="sptlrpc.gss.rsi_upcall" -- 1.8.3.1