From 2d57999401072a034650d00a37fb59ef9b3f53d0 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Tue, 28 Jan 2020 15:38:05 +0300 Subject: [PATCH] LU-6006 tests: add sleep 1 after command in background otherwise subsequent command may race with the one in background and fail: mkdir a & touch a/b Test-Parameters: trivial env=ONLY="22-23",ONLY_REPEAT=50 testlist=replay-dual Test-Parameters: env=ONLY="22-23",ONLY_REPEAT=50 fstype=zfs testlist=replay-dual Test-Parameters: env=ONLY="22-23",ONLY_REPEAT=50 mdscount=2 mdtcount=4 testlist=replay-dual Test-Parameters: env=ONLY="22-23",ONLY_REPEAT=50 fstype=zfs mdscount=2 mdtcount=4 testlist=replay-dual Signed-off-by: Alex Zhuravlev Change-Id: I0574d315e596cd899f7c4ea20c70b4c3da99b9b4 Reviewed-on: https://review.whamcloud.com/37343 Reviewed-by: Andreas Dilger Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/replay-dual.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index ea5df4e..ebbeafa 100755 --- a/lustre/tests/replay-dual.sh +++ b/lustre/tests/replay-dual.sh @@ -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)) -- 1.8.3.1