LU-13571 lnet: Correct handling of NETWORK_TIMEOUT status

[fs/lustre-release.git] / lustre / tests / sanity-gss.sh

diff --git a/lustre/tests/sanity-gss.sh b/lustre/tests/sanity-gss.sh
index e10687a..c91af2e 100755 (executable)
--- a/lustre/tests/sanity-gss.sh
+++ b/lustre/tests/sanity-gss.sh
@@ -7,26 +7,27 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test:
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"$SANITY_GSS_EXCEPT"}
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
-SRCDIR=`dirname $0`
-
-export MULTIOP=${MULTIOP:-multiop}
-
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-require_dsh_mds || exit 0
+ALWAYS_EXCEPT="$SANITY_GSS_EXCEPT "
+if $SHARED_KEY; then
+# bug number for skipped tests: LU-9795 LU-9795
+       ALWAYS_EXCEPT+="        8       90 "
+fi
 
 [ "$SLOW" = "no" ] && EXCEPT_SLOW="100 101"
 
+build_test_filter
+
+require_dsh_mds || exit 0
+
 # $RUNAS_ID may get set incorrectly somewhere else
-[ $UID -eq 0 -a $RUNAS_ID -eq 0 ] && error "\$RUNAS_ID set to 0, but \$UID is also 0!"
+[ $UID -eq 0 -a $RUNAS_ID -eq 0 ] &&
+       error "\$RUNAS_ID set to 0, but \$UID is also 0!"
 
 # remove $SEC, we'd like to control everything by ourselves
 unset SEC
@@ -47,8 +48,6 @@ rm -rf $DIR/[df][0-9]*
 
 check_runas_id $RUNAS_ID $RUNAS_ID $RUNAS
 
-build_test_filter
-
 start_dbench()
 {
     NPROC=`cat /proc/cpuinfo 2>/dev/null | grep ^processor | wc -l`
@@ -102,6 +101,9 @@ stop_dbench()
 calc_connection_cnt
 umask 077
 
+# Stop previously existing gss daemons
+stop_gss_daemons
+
 echo "bring up gss daemons..."
 # start gss daemon with -z flag for gssnull
 start_gss_daemons $(comma_list $(mdts_nodes)) "$LSVCGSSD -z -vv" ||
@@ -258,7 +260,7 @@ test_8()
     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"
+    $LCTL dk | grep -i "Early reply #" || error "No early reply"
 
     debugrestore
     do_facet $SINGLEMDS "echo $ATOLDBASE >> $ATHISTORY" || true
@@ -588,6 +590,11 @@ test_151() {
 run_test 151 "secure mgs connection: server flavor control"
 
 stop_gss_daemons
+if $GSS_KRB5 || $GSS_SK; then
+       start_gss_daemons
+fi
+
+restore_to_default_flavor
 
 complete $SECONDS
 check_and_cleanup_lustre