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 <adilger@whamcloud.com>
Change-Id: Ibd73625c64deaa99f6f2a515bc1214cbb83ebbe5
Reviewed-on: https://review.whamcloud.com/47656
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Lai Siyao <lai.siyao@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index ad77e79..c1de3f4 100755 (executable)
--- 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"