b=13932

[fs/lustre-release.git] / lustre / tests / replay-dual.sh

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 15ca9e8..07b45e7 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -5,37 +5,28 @@ set -e
 # bug number:  6088 10124 10800
 ALWAYS_EXCEPT="8    15c   17    $REPLAY_DUAL_EXCEPT"
 
+#                                                    
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="1 2 3 4 5 14"
+
+SAVE_PWD=$PWD
 PTLDEBUG=${PTLDEBUG:--1}
 LUSTRE=${LUSTRE:-`dirname $0`/..}
+SETUP=${SETUP:-""}
+CLEANUP=${CLEANUP:-""}
+MOUNT_2=${MOUNT_2:-"yes"}
 . $LUSTRE/tests/test-framework.sh
 
 init_test_env $@
 
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
-SETUP=${SETUP:-"setup"}
-CLEANUP=${CLEANUP:-"cleanup"}
 
 build_test_filter
 
-cleanup() {
-    stopall
-}
+cleanup_and_setup_lustre
+rm -rf $DIR/${TESTSUITE}/[df][0-9]* # bug 13798 new t-f tdir staff
+rm -rf $DIR/[df][0-9]*
 
-if [ "$ONLY" == "cleanup" ]; then
-    sysctl -w lnet.debug=0
-    cleanup
-    exit
-fi
-
-setup() {
-    cleanup
-    [ "$REFORMAT" ] && formatall
-    setupall
-    mount_client $MOUNT2
-}
-
-$SETUP
 [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
 
 test_1() {
@@ -193,6 +184,7 @@ test_11() {
     mcreate $MOUNT1/$tfile-5
     # drop all reint replies for a while
     do_facet $SINGLEMDS sysctl -w lustre.fail_loc=0x0119
+    # note that with this fail_loc set, facet_failover df will fail
     facet_failover $SINGLEMDS
     #sleep for while, let both clients reconnect and timeout
     sleep $((TIMEOUT * 2))
@@ -214,8 +206,8 @@ test_12() {
 #define OBD_FAIL_LDLM_ENQUEUE            0x302
     do_facet $SINGLEMDS sysctl -w lustre.fail_loc=0x80000302
     facet_failover $SINGLEMDS
-    df $MOUNT || return 1
     do_facet $SINGLEMDS sysctl -w lustre.fail_loc=0
+    df $MOUNT || return 1
 
     ls $DIR/$tfile
     kill -USR1 $MULTIPID || return 3
@@ -240,8 +232,8 @@ test_13() {
     # drop close 
     do_facet $SINGLEMDS sysctl -w lustre.fail_loc=0x80000115
     facet_failover $SINGLEMDS
-    df $MOUNT || return 1
     do_facet $SINGLEMDS sysctl -w lustre.fail_loc=0
+    df $MOUNT || return 1
 
     ls $DIR/$tfile
     $CHECKSTAT -t file $DIR/$tfile || return 2
@@ -259,7 +251,7 @@ test_14() {
     umount $MOUNT2
 
     facet_failover $SINGLEMDS
-    # expect failover to fail
+    # expect failover to fail due to missing client 2
     df $MOUNT && return 1
     sleep 1
 
@@ -444,10 +436,9 @@ test_19() { # Bug 10991 - resend of open request does not fail assertion.
 }
 run_test 19 "resend of open request"
 
-if [ "$ONLY" != "setup" ]; then
-   equals_msg test complete, cleaning up
-   SLEEP=$((`date +%s` - $NOW))
-   [ $SLEEP -lt $TIMEOUT ] && sleep $SLEEP
-   $CLEANUP
-fi
-echo "$0: completed"
+equals_msg `basename $0`: test complete, cleaning up
+SLEEP=$((`date +%s` - $NOW))
+[ $SLEEP -lt $TIMEOUT ] && sleep $SLEEP
+check_and_cleanup_lustre
+[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG || true
+