X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Freplay-dual.sh;h=8aa6de8f9643c3d6da15ddc062d86e840de5c684;hp=ea5df4ebbaa7f19c97cdd3be6df44b1a3f03ac8c;hb=ca754ec8b43416d41bbd401bad7d9f93746fb867;hpb=5290c48735290a0920d804daa7f428bb0df655c2 diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index ea5df4e..8aa6de8 100755 --- a/lustre/tests/replay-dual.sh +++ b/lustre/tests/replay-dual.sh @@ -451,7 +451,7 @@ test_18() { # bug 3822 - evicting client with enqueued lock do_facet client lctl set_param ldlm.namespaces.*.early_lock_cancel=0 do_facet client lctl set_param fail_loc=0x80000305 # drop cb, evict cancel_lru_locks mdc - usleep 500 # wait to ensure first client is one that will be evicted + sleep 0.1 # wait to ensure first client is one that will be evicted openfile -f O_RDONLY $MOUNT2/$tdir/$tfile wait $OPENPID do_facet client lctl set_param ldlm.namespaces.*.early_lock_cancel=1 @@ -634,6 +634,7 @@ test_22a () { do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x119 do_node $CLIENT1 $LFS mkdir -i $MDTIDX $MOUNT1/$remote_dir & CLIENT_PID=$! + sleep 1 fail mds$((MDTIDX + 1)) wait $CLIENT_PID || error "lfs mkdir failed" @@ -660,6 +661,7 @@ test_22b () { do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x119 do_node $CLIENT1 $LFS mkdir -i $MDTIDX $MOUNT1/$remote_dir & CLIENT_PID=$! + sleep 1 fail mds${MDTIDX},mds$((MDTIDX + 1)) wait $CLIENT_PID || error "lfs mkdir failed" @@ -690,6 +692,7 @@ test_22c () { do_facet mds$MDTIDX lctl set_param fail_loc=0x1701 do_node $CLIENT1 $LFS mkdir -i $MDTIDX $MOUNT1/$remote_dir & CLIENT_PID=$! + sleep 1 do_facet mds$MDTIDX lctl set_param fail_loc=0 fail mds$MDTIDX @@ -717,6 +720,7 @@ test_22d () { do_facet mds$MDTIDX lctl set_param fail_loc=0x1701 do_node $CLIENT1 $LFS mkdir -i $MDTIDX $MOUNT1/$remote_dir & CLIENT_PID=$! + sleep 1 do_facet mds$MDTIDX lctl set_param fail_loc=0 fail mds${MDTIDX},mds$((MDTIDX + 1)) @@ -761,6 +765,7 @@ test_23a () { do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x119 do_node $CLIENT1 rmdir $MOUNT1/$remote_dir & local CLIENT_PID=$! + sleep 1 do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0 fail mds$((MDTIDX + 1)) @@ -790,6 +795,7 @@ test_23b () { do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x119 do_node $CLIENT1 rmdir $MOUNT1/$remote_dir & local CLIENT_PID=$! + sleep 1 do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0 fail mds${MDTIDX},mds$((MDTIDX + 1)) @@ -824,6 +830,7 @@ test_23c () { do_facet mds${MDTIDX} lctl set_param fail_loc=0x1701 do_node $CLIENT1 rmdir $MOUNT1/$remote_dir & CLIENT_PID=$! + sleep 1 do_facet mds${MDTIDX} lctl set_param fail_loc=0 fail mds${MDTIDX} @@ -853,6 +860,7 @@ test_23d () { do_facet mds${MDTIDX} lctl set_param fail_loc=0x1701 do_node $CLIENT1 rmdir $MOUNT1/$remote_dir & CLIENT_PID=$! + sleep 1 do_facet mds${MDTIDX} lctl set_param fail_loc=0 fail mds${MDTIDX},mds$((MDTIDX + 1))