From: Alex Zhuravlev <bzzz@whamcloud.com>
Date: Tue, 28 Jan 2020 12:38:05 +0000 (+0300)
Subject: LU-6006 tests: add sleep 1 after command in background
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;ds=sidebyside;h=70fa032285776eb5ffd444ea7ca6f5d7596e5407;p=fs%2Flustre-release.git

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

Lustre-change: https://review.whamcloud.com/37343
Lustre-commit: 2d57999401072a034650d00a37fb59ef9b3f53d0

Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: I0574d315e596cd899f7c4ea20c70b4c3da99b9b4
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Signed-off-by: Etienne AUJAMES <eaujames@ddn.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/45916
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index b93a24b..fe0be97 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -637,6 +637,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"
@@ -663,6 +664,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"
@@ -693,6 +695,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
@@ -720,6 +723,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))
@@ -764,6 +768,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))
@@ -793,6 +798,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))
@@ -827,6 +833,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}
@@ -856,6 +863,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))