From c4ebdc96061ae9c24ac471b2866f2087bc3e98d4 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Thu, 16 Jun 2022 13:25:50 -0600 Subject: [PATCH] LU-6864 tests: properly skip sanity/245b in interop Skip sanity test_245b if the server does not support multi_mod_rpcs. Test-Parameters: trivial serverversion=2.14 testlist=sanity env=ONLY=245 Fixes: 23028efcae01 ("LU-6864 osp: manage number of modify RPCs in flight") Signed-off-by: Andreas Dilger Change-Id: Ibd73625c64deaa99f6f2a515bc1214cbb83ebbe5 Reviewed-on: https://review.whamcloud.com/47656 Tested-by: jenkins Reviewed-by: James Simmons Reviewed-by: Lai Siyao Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index ad77e79..c1de3f4 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -20987,26 +20987,26 @@ test_245b() { local connect_data_name="max_mod_rpcs" local out - remote_mds_nodsh && skip "remote MDS with nodsh" && return + remote_mds_nodsh && skip "remote MDS with nodsh" [[ $MDSCOUNT -ge 2 ]] || skip "needs >= 2 MDTs" # check if multiple modify RPCs flag is set out=$(do_facet mds1 \ - $LCTL get_param osp.$FSNAME-MDT0001-osp-MDT0000.import | - grep "connect_flags:") + $LCTL get_param osp.$FSNAME-MDT0001-osp-MDT0000.import | + grep "connect_flags:") echo "$out" - if [[ "$out" =~ $flagname ]]; then - echo "connect flag $flagname is not set" - return 0 - fi + [[ "$out" =~ $flagname ]] || skip "connect flag $flagname is not set" # check if multiple modify RPCs data is set out=$(do_facet mds1 \ - $LCTL get_param osp.$FSNAME-MDT0001-osp-MDT0000.import) + $LCTL get_param osp.$FSNAME-MDT0001-osp-MDT0000.import) [[ "$out" =~ $connect_data_name ]] || - error "import should have connect data $connect_data_name" + { + echo "$out" + error "missing connect data $connect_data_name" + } } run_test 245b "check osp connection flag/data: multiple modify RPCs" -- 1.8.3.1