X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Freplay-dual.sh;h=bc55eaf8576bc6644f04f032914baa68187de835;hb=e1c1722f0d76850bbc5fb2e540ceb2149e31c19d;hp=f1dba24b48c99aabb47c6bdd7503381cf4091db8;hpb=d81556d5d57f2880f4571b46c1639bab154e60f4;p=fs%2Flustre-release.git

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index f1dba24..bc55eaf 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-# bug number:  6088 10124 10800
-ALWAYS_EXCEPT="8    15c   17    $REPLAY_DUAL_EXCEPT"
+# bug number:  13129 13129 6088 10124 
+ALWAYS_EXCEPT="2     3     8    15c   $REPLAY_DUAL_EXCEPT"
 
 SAVE_PWD=$PWD
 PTLDEBUG=${PTLDEBUG:--1}
@@ -17,10 +17,13 @@ init_test_env $@
 
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
+#
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="1 2 3 4 5 14"
 
 build_test_filter
 
 cleanup_and_setup_lustre
+rm -rf $DIR/[df][0-9]*
 
 [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
 
@@ -89,10 +92,8 @@ run_test 4 "|X| mkdir adir (-EEXIST), mkdir adir/bdir "
 test_5() {
     # multiclient version of replay_single.sh/test_8
     mcreate $MOUNT1/a
-    multiop $MOUNT2/a o_tSc &
+    multiop_bg_pause $MOUNT2/a o_tSc || return  1
     pid=$!
-    # give multiop a chance to open
-    sleep 1 
     rm -f $MOUNT1/a
     replay_barrier $SINGLEMDS
     kill -USR1 $pid
@@ -107,12 +108,10 @@ run_test 5 "open, unlink |X| close"
 
 test_6() {
     mcreate $MOUNT1/a
-    multiop $MOUNT2/a o_c &
+    multiop_bg_pause $MOUNT2/a o_c || return 1
     pid1=$!
-    multiop $MOUNT1/a o_c &
+    multiop_bg_pause $MOUNT1/a o_c || return 1
     pid2=$!
-    # give multiop a chance to open
-    sleep 1 
     rm -f $MOUNT1/a
     replay_barrier $SINGLEMDS
     kill -USR1 $pid1
@@ -179,6 +178,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))
@@ -193,15 +193,14 @@ run_test 11 "both clients timeout during replay"
 test_12() {
     replay_barrier $SINGLEMDS
 
-    multiop $DIR/$tfile mo_c &
+    multiop_bg_pause $DIR/$tfile mo_c || return 1
     MULTIPID=$!
-    sleep 5
 
 #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
@@ -214,9 +213,8 @@ test_12() {
 run_test 12 "open resend timeout"
 
 test_13() {
-    multiop $DIR/$tfile mo_c &
+    multiop_bg_pause $DIR/$tfile mo_c || return 1
     MULTIPID=$!
-    sleep 5
 
     replay_barrier $SINGLEMDS
 
@@ -226,8 +224,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 +243,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
 
@@ -416,6 +414,8 @@ test_18() { # bug 3822 - evicting client with enqueued lock
     wait $OPENPID
     dmesg | grep "entering recovery in server" && \
         error "client not evicted" || true
+    do_facet client "sysctl -w lustre.fail_loc=0"
+    do_facet $SINGLEMDS "sysctl -w lustre.fail_loc=0"
 }
 run_test 18 "ldlm_handle_enqueue succeeds on evicted export (3822)"