b=14512

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

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index f1dba24..07b45e7 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -5,6 +5,9 @@ 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`/..}
@@ -21,6 +24,8 @@ init_test_env $@
 build_test_filter
 
 cleanup_and_setup_lustre
+rm -rf $DIR/${TESTSUITE}/[df][0-9]* # bug 13798 new t-f tdir staff
+rm -rf $DIR/[df][0-9]*
 
 [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
 
@@ -179,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))
@@ -200,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
@@ -226,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
@@ -245,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