X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-gss.sh;h=701c0dbe453c889a10ca4c4f7ded7f1668c4a7ae;hb=3402e6c6517cc15f159b19bf4462279285cd83f2;hp=ca5450f28a68bc218fe5bf26c1b50b39d7821910;hpb=c96486d39bbe365da906d89498f38577439d21fd;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-gss.sh b/lustre/tests/sanity-gss.sh
index ca5450f..701c0db 100644
--- a/lustre/tests/sanity-gss.sh
+++ b/lustre/tests/sanity-gss.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
+# vim:shiftwidth=4:softtabstop=4:tabstop=4:
 #
 # Run select tests by setting ONLY, or as arguments to the script.
 # Skip specific tests by setting EXCEPT.
@@ -26,6 +26,8 @@ export PATH=$PWD/$SRCDIR:$SRCDIR:$SRCDIR/../utils:$SRCDIR/../utils/gss:$PATH:/sb
 export NAME=${NAME:-local}
 SAVE_PWD=$PWD
 
+export MULTIOP=${MULTIOP:-multiop}
+
 CLEANUP=${CLEANUP:-""}
 SETUP=${SETUP:-""}
 
@@ -33,8 +35,9 @@ LUSTRE=${LUSTRE:-`dirname $0`/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_logging
 
-remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0
+require_dsh_mds || exit 0
 
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="100 101"
 
@@ -50,16 +53,7 @@ unset SEC
 KRB5_CCACHE_DIR=/tmp
 KRB5_CRED=$KRB5_CCACHE_DIR/krb5cc_$RUNAS_ID
 KRB5_CRED_SAVE=$KRB5_CCACHE_DIR/krb5cc.sanity.save
-CLICOUNT=2
-cnt_mdt2ost=0
-cnt_mdt2mdt=0
-cnt_cli2ost=0
-cnt_cli2mdt=0
-cnt_all2ost=0
-cnt_all2mdt=0
-cnt_all2all=0
 DBENCH_PID=0
-PROC_CLI="srpc_info"
 
 # set manually
 GSS=true
@@ -87,258 +81,6 @@ check_runas_id $RUNAS_ID $RUNAS_ID $RUNAS
 
 build_test_filter
 
-combination()
-{
-    local M=$1
-    local N=$2
-    local R=1
-
-    if [ $M -lt $N ]; then
-        R=0
-    else
-        N=$((N + 1))
-        while [ $N -le $M ]; do
-            R=$((R * N))
-            N=$((N + 1))
-        done
-    fi
-
-    echo $R
-    return 0
-}
-
-calc_connection_cnt() {
-    # MDT->MDT = 2 * C(M, 2)
-    # MDT->OST = M * O
-    # CLI->OST = C * O
-    # CLI->MDT = C * M
-    comb_m2=$(combination $MDSCOUNT 2)
-
-    cnt_mdt2mdt=$((comb_m2 * 2))
-    cnt_mdt2ost=$((MDSCOUNT * OSTCOUNT))
-    cnt_cli2ost=$((CLICOUNT * OSTCOUNT))
-    cnt_cli2mdt=$((CLICOUNT * MDSCOUNT))
-    cnt_all2ost=$((cnt_mdt2ost + cnt_cli2ost))
-    cnt_all2mdt=$((cnt_mdt2mdt + cnt_cli2mdt))
-    cnt_all2all=$((cnt_mdt2ost + cnt_mdt2mdt + cnt_cli2ost + cnt_cli2mdt))
-}
-
-set_rule()
-{
-    local tgt=$1
-    local net=$2
-    local dir=$3
-    local flavor=$4
-    local cmd="$tgt.srpc.flavor"
-
-    if [ $net == "any" ]; then
-        net="default"
-    fi
-    cmd="$cmd.$net"
-
-    if [ $dir != "any" ]; then
-        cmd="$cmd.$dir"
-    fi
-
-    cmd="$cmd=$flavor"
-    log "Setting sptlrpc rule: $cmd"
-    do_facet mgs "$LCTL conf_param $cmd"
-}
-
-count_flvr()
-{
-    local output=$1
-    local flavor=$2
-    local count=0
-
-    rpc_flvr=`echo $flavor | awk -F - '{ print $1 }'`
-    bulkspec=`echo $flavor | awk -F - '{ print $2 }'`
-
-    count=`echo "$output" | grep "rpc flavor" | grep $rpc_flvr | wc -l`
-
-    if [ "x$bulkspec" != "x" ]; then
-        algs=`echo $bulkspec | awk -F : '{ print $2 }'`
-
-        if [ "x$algs" != "x" ]; then
-            bulk_count=`echo "$output" | grep "bulk flavor" | grep $algs | wc -l`
-        else
-            bulk=`echo $bulkspec | awk -F : '{ print $1 }'`
-            if [ $bulk == "bulkn" ]; then
-                bulk_count=`echo "$output" | grep "bulk flavor" \
-                            | grep "null/null" | wc -l`
-            elif [ $bulk == "bulki" ]; then
-                bulk_count=`echo "$output" | grep "bulk flavor" \
-                            | grep "/null" | grep -v "null/" | wc -l`
-            else
-                bulk_count=`echo "$output" | grep "bulk flavor" \
-                            | grep -v "/null" | grep -v "null/" | wc -l`
-            fi
-        fi
-
-        [ $bulk_count -lt $count ] && count=$bulk_count
-    fi
-
-    echo $count
-}
-
-flvr_cnt_cli2mdt()
-{
-    local flavor=$1
-
-    output=`do_facet client lctl get_param -n mdc.*-MDT*-mdc-*.$PROC_CLI 2>/dev/null`
-    count_flvr "$output" $flavor
-}
-
-flvr_cnt_cli2ost()
-{
-    local flavor=$1
-
-    output=`do_facet client lctl get_param -n osc.*OST*-osc-[^M][^D][^T]*.$PROC_CLI 2>/dev/null`
-    count_flvr "$output" $flavor
-}
-
-flvr_cnt_mdt2mdt()
-{
-    local flavor=$1
-    local cnt=0
-
-    if [ $MDSCOUNT -le 1 ]; then
-        echo 0
-        return
-    fi
-
-    for num in `seq $MDSCOUNT`; do
-        output=`do_facet mds$num lctl get_param -n mdc.*-MDT*-mdc[0-9]*.$PROC_CLI 2>/dev/null`
-        tmpcnt=`count_flvr "$output" $flavor`
-        cnt=$((cnt + tmpcnt))
-    done
-    echo $cnt;
-}
-
-flvr_cnt_mdt2ost()
-{
-    local flavor=$1
-    local cnt=0
-
-    for num in `seq $MDSCOUNT`; do
-        output=`do_facet mds$num lctl get_param -n osc.*OST*-osc-MDT*.$PROC_CLI 2>/dev/null`
-        tmpcnt=`count_flvr "$output" $flavor`
-        cnt=$((cnt + tmpcnt))
-    done
-    echo $cnt;
-}
-
-flvr_cnt_mgc2mgs()
-{
-    local flavor=$1
-
-    output=`do_facet client lctl get_param -n mgc.*.$PROC_CLI 2>/dev/null`
-    count_flvr "$output" $flavor
-}
-
-do_check_flavor()
-{
-    local dir=$1        # from to
-    local flavor=$2     # flavor expected
-    local res=0
-
-    if [ $dir == "cli2mdt" ]; then
-        res=`flvr_cnt_cli2mdt $flavor`
-    elif [ $dir == "cli2ost" ]; then
-        res=`flvr_cnt_cli2ost $flavor`
-    elif [ $dir == "mdt2mdt" ]; then
-        res=`flvr_cnt_mdt2mdt $flavor`
-    elif [ $dir == "mdt2ost" ]; then
-        res=`flvr_cnt_mdt2ost $flavor`
-    elif [ $dir == "all2ost" ]; then
-        res1=`flvr_cnt_mdt2ost $flavor`
-        res2=`flvr_cnt_cli2ost $flavor`
-        res=$((res1 + res2))
-    elif [ $dir == "all2mdt" ]; then
-        res1=`flvr_cnt_mdt2mdt $flavor`
-        res2=`flvr_cnt_cli2mdt $flavor`
-        res=$((res1 + res2))
-    elif [ $dir == "all2all" ]; then
-        res1=`flvr_cnt_mdt2ost $flavor`
-        res2=`flvr_cnt_cli2ost $flavor`
-        res3=`flvr_cnt_mdt2mdt $flavor`
-        res4=`flvr_cnt_cli2mdt $flavor`
-        res=$((res1 + res2 + res3 + res4))
-    fi
-
-    echo $res
-}
-
-wait_flavor()
-{
-    local dir=$1        # from to
-    local flavor=$2     # flavor expected
-    local expect=$3     # number expected
-    local res=0
-
-    for ((i=0;i<20;i++)); do
-        echo -n "checking..."
-        res=$(do_check_flavor $dir $flavor)
-        if [ $res -eq $expect ]; then
-            echo "found $res $flavor connections of $dir, OK"
-            return 0
-        else
-            echo "found $res $flavor connections of $dir, not ready ($expect)"
-            sleep 4
-        fi
-    done
-
-    echo "Error checking $flavor of $dir: expect $expect, actual $res"
-    return 1
-}
-
-restore_to_default_flavor()
-{
-    local proc="mgs.MGS.live.$FSNAME"
-
-    echo "restoring to default flavor..."
-
-    nrule=`do_facet mgs lctl get_param -n $proc 2>/dev/null | grep ".srpc.flavor." | wc -l`
-
-    # remove all existing rules if any
-    if [ $nrule -ne 0 ]; then
-        echo "$nrule existing rules"
-        for rule in `do_facet mgs lctl get_param -n $proc 2>/dev/null | grep ".srpc.flavor."`; do
-            echo "remove rule: $rule"
-            spec=`echo $rule | awk -F = '{print $1}'`
-            do_facet mgs "$LCTL conf_param $spec="
-        done
-    fi
-
-    # verify no rules left
-    nrule=`do_facet mgs lctl get_param -n $proc 2>/dev/null | grep ".srpc.flavor." | wc -l`
-    [ $nrule -ne 0 ] && error "still $nrule rules left"
-
-    # wait for default flavor to be applied
-    # currently default flavor for all connections are 'null'
-    wait_flavor all2all null $cnt_all2all
-    echo "now at default flavor settings"
-}
-
-set_flavor_all()
-{
-    local flavor=$1
-
-    echo "setting all flavor to $flavor"
-
-    res=$(do_check_flavor all2all $flavor)
-    if [ $res -eq $cnt_all2all ]; then
-        echo "already have total $res $flavor connections"
-        return
-    fi
-
-    echo "found $res $flavor out of total $cnt_all2all connections"
-    restore_to_default_flavor
-
-    set_rule $FSNAME any any $flavor
-    wait_flavor all2all $flavor $cnt_all2all
-}
-
 start_dbench()
 {
     NPROC=`cat /proc/cpuinfo 2>/dev/null | grep ^processor | wc -l`
@@ -456,6 +198,7 @@ test_1() {
     local file=$DIR/$tfile
 
     chmod 0777 $DIR || error "chmod $DIR failed"
+    $RUNAS touch $DIR
     # access w/o cred
     $RUNAS kdestroy
     $RUNAS $LFS flushctx $MOUNT || error "can't flush context on $MOUNT"
@@ -500,7 +243,7 @@ test_3() {
     $RUNAS cat $file > /dev/null || error "$RUNAS_ID cat error"
 
     # start multiop
-    $RUNAS multiop $file o_r &
+    $RUNAS $MULTIOP $file o_r &
     OPPID=$!
     # wait multiop finish its open()
     sleep 1
@@ -573,9 +316,9 @@ test_5() {
     [ -f $file1 ] || error "$file1 not found"
 
     # stop lsvcgssd
-    send_sigint mds lsvcgssd
+    send_sigint $(comma_list $(mdts_nodes)) lsvcgssd
     sleep 5
-    check_gss_daemon_facet mds lsvcgssd && error "lsvcgssd still running"
+    check_gss_daemon_nodes $(comma_list $(mdts_nodes)) lsvcgssd && error "lsvcgssd still running"
 
     # flush context, and touch
     $RUNAS $LFS flushctx $MOUNT || error "can't flush context on $MOUNT"
@@ -591,9 +334,9 @@ test_5() {
 
     # restart lsvcgssd, expect touch suceed
     echo "restart lsvcgssd and recovering"
-    do_facet mds "$LSVCGSSD -v"
+    start_gss_daemons $(comma_list $(mdts_nodes)) "$LSVCGSSD -v"
     sleep 5
-    check_gss_daemon_facet mds lsvcgssd
+    check_gss_daemon_nodes $(comma_list $(mdts_nodes)) lsvcgssd
     wait $TOUCHPID || error "touch fail"
     [ -f $file2 ] || error "$file2 not found"
 }
@@ -647,25 +390,32 @@ run_test 7 "exercise enlarge_reqbuf()"
 
 test_8()
 {
-    local ATHISTORY=$(do_facet mds "find /sys/ -name at_history")
-    local ATOLDBASE=$(do_facet mds "cat $ATHISTORY")
-    do_facet mds "echo 8 >> $ATHISTORY"
+    local ATHISTORY=$(do_facet $SINGLEMDS "find /sys/ -name at_history")
+    local ATOLDBASE=$(do_facet $SINGLEMDS "cat $ATHISTORY")
+    local REQ_DELAY
+    do_facet $SINGLEMDS "echo 8 >> $ATHISTORY"
+
+    mkdir -p $DIR/d8
+    chmod a+w $DIR/d8
 
     $LCTL dk > /dev/null
     debugsave
     sysctl -w lnet.debug="+other"
 
-    mkdir -p $DIR/d8
-    chmod a+w $DIR/d8
-
-    REQ_DELAY=`lctl get_param -n mdc.${FSNAME}-MDT0000-mdc-*.timeouts |
-               awk '/portal 12/ {print $5}' | tail -1`
+    # wait for the at estimation come down, this is faster
+    while [ true ]; do
+        REQ_DELAY=`lctl get_param -n mdc.${FSNAME}-MDT0000-mdc-*.timeouts |
+                   awk '/portal 12/ {print $5}' | tail -1`
+        [ $REQ_DELAY -le 5 ] && break
+        echo "current AT estimation is $REQ_DELAY, wait a little bit"
+        sleep 8
+    done
     REQ_DELAY=$((${REQ_DELAY} + ${REQ_DELAY} / 4 + 5))
 
     # sleep sometime in ctx handle
-    do_facet mds lctl set_param fail_val=$REQ_DELAY
+    do_facet $SINGLEMDS lctl set_param fail_val=$REQ_DELAY
 #define OBD_FAIL_SEC_CTX_HDL_PAUSE       0x1204
-    do_facet mds lctl set_param fail_loc=0x1204
+    do_facet $SINGLEMDS lctl set_param fail_loc=0x1204
 
     $RUNAS $LFS flushctx $MOUNT || error "can't flush context on $MOUNT"
 
@@ -673,13 +423,13 @@ test_8()
     TOUCHPID=$!
     echo "waiting for touch (pid $TOUCHPID) to finish..."
     sleep 2 # give it a chance to really trigger context init rpc
-    do_facet mds sysctl -w lustre.fail_loc=0
+    do_facet $SINGLEMDS $LCTL set_param fail_loc=0
     wait $TOUCHPID || error "touch should have succeeded"
 
     $LCTL dk | grep "Early reply #" || error "No early reply"
 
     debugrestore
-    do_facet mds "echo $ATOLDBASE >> $ATHISTORY" || true
+    do_facet $SINGLEMDS "echo $ATOLDBASE >> $ATHISTORY" || true
 }
 run_test 8 "Early reply sent for slow gss context negotiation"
 
@@ -697,7 +447,7 @@ test_90() {
 
     restore_to_default_flavor
     set_rule $FSNAME any any krb5p
-    wait_flavor all2all krb5p $cnt_all2all
+    wait_flavor all2all krb5p
 
     start_dbench
 
@@ -782,23 +532,23 @@ test_100() {
     # all: null -> krb5n -> krb5a -> krb5i -> krb5p -> plain
     #
     set_rule $FSNAME any any krb5n
-    wait_flavor all2all krb5n $cnt_all2all || error_dbench "1"
+    wait_flavor all2all krb5n || error_dbench "1"
     check_dbench
 
     set_rule $FSNAME any any krb5a
-    wait_flavor all2all krb5a $cnt_all2all || error_dbench "2"
+    wait_flavor all2all krb5a || error_dbench "2"
     check_dbench
 
     set_rule $FSNAME any any krb5i
-    wait_flavor all2all krb5i $cnt_all2all || error_dbench "3"
+    wait_flavor all2all krb5i || error_dbench "3"
     check_dbench
 
     set_rule $FSNAME any any krb5p
-    wait_flavor all2all krb5p $cnt_all2all || error_dbench "4"
+    wait_flavor all2all krb5p || error_dbench "4"
     check_dbench
 
     set_rule $FSNAME any any plain
-    wait_flavor all2all plain $cnt_all2all || error_dbench "5"
+    wait_flavor all2all plain || error_dbench "5"
     check_dbench
 
     #
@@ -808,19 +558,19 @@ test_100() {
     # C - O: krb5n
     #
     set_rule $FSNAME any mdt2mdt krb5a
-    wait_flavor mdt2mdt krb5a $cnt_mdt2mdt || error_dbench "6"
+    wait_flavor mdt2mdt krb5a || error_dbench "6"
     check_dbench
 
     set_rule $FSNAME any cli2mdt krb5i
-    wait_flavor cli2mdt krb5i $cnt_cli2mdt || error_dbench "7"
+    wait_flavor cli2mdt krb5i || error_dbench "7"
     check_dbench
 
     set_rule $FSNAME any mdt2ost krb5p
-    wait_flavor mdt2ost krb5p $cnt_mdt2ost || error_dbench "8"
+    wait_flavor mdt2ost krb5p || error_dbench "8"
     check_dbench
 
     set_rule $FSNAME any cli2ost krb5n
-    wait_flavor cli2ost krb5n $cnt_cli2ost || error_dbench "9"
+    wait_flavor cli2ost krb5n || error_dbench "9"
     check_dbench
 
     #
@@ -831,11 +581,11 @@ test_100() {
     #
     set_rule $FSNAME-MDT0000 any any krb5p
     set_rule $FSNAME-OST0000 any any krb5i
-    wait_flavor mdt2mdt krb5a $cnt_mdt2mdt || error_dbench "10"
-    wait_flavor cli2mdt krb5i $cnt_cli2mdt || error_dbench "11"
+    wait_flavor mdt2mdt krb5a || error_dbench "10"
+    wait_flavor cli2mdt krb5i || error_dbench "11"
     check_dbench
-    wait_flavor mdt2ost krb5p $cnt_mdt2ost || error_dbench "12"
-    wait_flavor cli2ost krb5n $cnt_cli2ost || error_dbench "13"
+    wait_flavor mdt2ost krb5p || error_dbench "12"
+    wait_flavor cli2ost krb5n || error_dbench "13"
 
     #
     # delete all dir-specific rules
@@ -845,10 +595,10 @@ test_100() {
     set_rule $FSNAME any mdt2ost
     set_rule $FSNAME any cli2ost
     wait_flavor mdt2mdt krb5p $((MDSCOUNT - 1)) || error_dbench "14"
-    wait_flavor cli2mdt krb5p $CLICOUNT || error_dbench "15"
+    wait_flavor cli2mdt krb5p $(get_clients_mount_count) || error_dbench "15"
     check_dbench
     wait_flavor mdt2ost krb5i $MDSCOUNT || error_dbench "16"
-    wait_flavor cli2ost krb5i $CLICOUNT || error_dbench "17"
+    wait_flavor cli2ost krb5i $(get_clients_mount_count) || error_dbench "17"
     check_dbench
 
     #
@@ -858,7 +608,7 @@ test_100() {
     #
     set_rule $FSNAME-MDT0000 any any
     set_rule $FSNAME-OST0000 any any || error_dbench "18"
-    wait_flavor all2all plain $cnt_all2all || error_dbench "19"
+    wait_flavor all2all plain || error_dbench "19"
     check_dbench
 
     stop_dbench
@@ -867,51 +617,44 @@ run_test 100 "change security flavor on the fly under load"
 
 switch_sec_test()
 {
-    local count=$1
-    local flavor0=$2
-    local flavor1=$3
-    local flavor2=$4
-    local df_pid=0
-    local wait_time=$((TIMEOUT + TIMEOUT / 4))
+    local flavor0=$1
+    local flavor1=$2
+    local filename=$DIR/$tfile
+    local multiop_pid
     local num
 
     #
-    # stop gss daemon, then switch to flavor1 (which should be a gss flavor),
-    # and run a 'df' which should hanging, wait the request timeout and
-    # resend, then switch the flavor to another one. To exercise the code of
-    # switching ctx/sec for a resend request.
+    # after set to flavor0, start multop which use flavor0 rpc, and let
+    # server drop the reply; then switch to flavor1, the resend should be
+    # completed using flavor1. To exercise the code of switching ctx/sec
+    # for a resend request.
     #
-    echo ">>>>>>>>>>>>>>> Testing $flavor0 -> $flavor1 -> $flavor2..."
+    log ">>>>>>>>>>>>>>> Testing $flavor0 -> $flavor1 <<<<<<<<<<<<<<<<<<<"
 
-    echo "(0) set base flavor $flavor0"
     set_rule $FSNAME any cli2mdt $flavor0
-    wait_flavor cli2mdt $flavor0 $count
-    df $MOUNT
-    if [ $? -ne 0 ]; then
-        error "initial df failed"
-    fi
-
-    stop_gss_daemons
+    wait_flavor cli2mdt $flavor0
+    rm -f $filename || error "remove old $filename failed"
+
+#MDS_REINT = 36
+#define OBD_FAIL_PTLRPC_DROP_REQ_OPC     0x513
+    do_facet $SINGLEMDS lctl set_param fail_val=36
+    do_facet $SINGLEMDS lctl set_param fail_loc=0x513
+    log "starting multiop"
+    $MULTIOP $filename m &
+    multiop_pid=$!
+    echo "multiop pid=$multiop_pid"
     sleep 1
 
-    echo "(1) $flavor0 -> $flavor1"
     set_rule $FSNAME any cli2mdt $flavor1
-    wait_flavor cli2mdt $flavor1 $count
-    df $MOUNT &
-    df_pid=$!
-    sleep 1
+    wait_flavor cli2mdt $flavor1
 
-    echo "waiting $wait_time seconds for df ($df_pid)"
-    sleep $wait_time
-    num=`ps --no-headers -p $df_pid 2>/dev/null | wc -l`
-    [ $num -eq 1 ] || error "df already ended ($num)"
-    echo "process $df_pid is still hanging there... OK"
+    num=`ps --no-headers -p $multiop_pid 2>/dev/null | wc -l`
+    [ $num -eq 1 ] || error "multiop($multiop_pid) already ended ($num)"
+    echo "process $multiop_pid is still hanging there... OK"
 
-    echo "(2) set end flavor $flavor2"
-    set_rule $FSNAME any cli2mdt $flavor2
-    wait_flavor cli2mdt $flavor2 $count
-    start_gss_daemons
-    wait $df_pid || error "df returned error"
+    do_facet $SINGLEMDS lctl set_param fail_loc=0
+    log "waiting for multiop ($multiop_pid) to finish"
+    wait $multiop_pid || error "multiop returned error"
 }
 
 test_101()
@@ -919,18 +662,18 @@ test_101()
     # started from default flavors
     restore_to_default_flavor
 
-    switch_sec_test $cnt_cli2mdt null krb5n null
-    switch_sec_test $cnt_cli2mdt null krb5a null
-    switch_sec_test $cnt_cli2mdt null krb5i null
-    switch_sec_test $cnt_cli2mdt null krb5p null
-    switch_sec_test $cnt_cli2mdt null krb5i plain
-    switch_sec_test $cnt_cli2mdt plain krb5p plain
-    switch_sec_test $cnt_cli2mdt plain krb5n krb5a
-    switch_sec_test $cnt_cli2mdt krb5a krb5i krb5p
-    switch_sec_test $cnt_cli2mdt krb5p krb5a krb5n
-    switch_sec_test $cnt_cli2mdt krb5n krb5p krb5i
+    switch_sec_test null  plain
+    switch_sec_test plain krb5n
+    switch_sec_test krb5n krb5a
+    switch_sec_test krb5a krb5i
+    switch_sec_test krb5i krb5p
+    switch_sec_test krb5p null
+    switch_sec_test null  krb5p
+    switch_sec_test krb5p krb5i
+    switch_sec_test krb5i plain
+    switch_sec_test plain krb5p
 }
-run_test 101 "switch ctx as well as sec for resending request"
+run_test 101 "switch ctx/sec for resending request"
 
 error_102()
 {
@@ -958,7 +701,7 @@ test_102() {
     set_rule $FSNAME any any null
 
     check_dbench
-    wait_flavor all2all null $cnt_all2all || error_dbench "1"
+    wait_flavor all2all null || error_dbench "1"
     check_dbench
 
     echo "waiting for 15s and check again"
@@ -973,7 +716,7 @@ test_102() {
     set_rule $FSNAME any any krb5i
 
     check_dbench
-    wait_flavor all2all krb5i $cnt_all2all || error_dbench "2"
+    wait_flavor all2all krb5i || error_dbench "2"
     check_dbench
 
     echo "waiting for 15s and check again"
@@ -986,6 +729,10 @@ run_test 102 "survive from insanely fast flavor switch"
 
 test_150() {
     local save_opts
+    local count
+    local clients=$CLIENTS
+
+    [ -z $clients ] && clients=$HOSTNAME
 
     # started from default flavors
     restore_to_default_flavor
@@ -995,26 +742,26 @@ test_150() {
     count=`flvr_cnt_mgc2mgs null`
     [ $count -eq 1 ] || error "$count mgc connection use null flavor"
 
-    # umount both clients
-    zconf_umount $HOSTNAME $MOUNT || return 1
-    zconf_umount $HOSTNAME $MOUNT2 || return 2
-
-    # mount client with default flavor - should succeed
-    zconf_mount $HOSTNAME $MOUNT || error "mount with default flavor should have succeeded"
-    zconf_umount $HOSTNAME $MOUNT || return 5
+    zconf_umount_clients $clients $MOUNT || return 1
 
     # mount client with conflict flavor - should fail
     save_opts=$MOUNTOPT
     MOUNTOPT="$MOUNTOPT,mgssec=krb5p"
-    zconf_mount $HOSTNAME $MOUNT && error "mount with conflict flavor should have failed"
+    zconf_mount_clients $clients $MOUNT && \
+        error "mount with conflict flavor should have failed"
     MOUNTOPT=$save_opts
 
     # mount client with same flavor - should succeed
     save_opts=$MOUNTOPT
     MOUNTOPT="$MOUNTOPT,mgssec=null"
-    zconf_mount $HOSTNAME $MOUNT || error "mount with same flavor should have succeeded"
-    zconf_umount $HOSTNAME $MOUNT || return 6
+    zconf_mount_clients $clients $MOUNT || \
+        error "mount with same flavor should have succeeded"
     MOUNTOPT=$save_opts
+    zconf_umount_clients $clients $MOUNT || return 2
+
+    # mount client with default flavor - should succeed
+    zconf_mount_clients $clients $MOUNT || \
+        error "mount with default flavor should have succeeded"
 }
 run_test 150 "secure mgs connection: client flavor setting"
 
@@ -1048,6 +795,6 @@ test_151() {
 }
 run_test 151 "secure mgs connection: server flavor control"
 
-equals_msg `basename $0`: test complete, cleaning up
+complete $SECONDS
 check_and_cleanup_lustre
-[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true
+exit_status