X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Freplay-single.sh;h=a6ac607bd09af5e92ff507dabc104ea43bc8cb34;hp=de797004eaed170ae79ae767b0f67677b8af324e;hb=5f3e926ac9ff8ad134ad920d0e8545e16395ef3b;hpb=e19b51372ad94818a7a79b1fbae5b55c665ba59f

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index de79700..a6ac607 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -2045,11 +2045,11 @@ test_80a() {
 
 	mkdir -p $DIR/$tdir
 	#define OBD_FAIL_UPDATE_OBJ_NET_REP	0x1701
-	do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x1701
+	do_facet mds${MDTIDX} lctl set_param fail_loc=0x1701
 	$LFS mkdir -i $MDTIDX $remote_dir &
 	local CLIENT_PID=$!
 
-	fail mds$((MDTIDX + 1))
+	fail mds${MDTIDX}
 
 	wait $CLIENT_PID || error "remote creation failed"
 
@@ -2058,7 +2058,7 @@ test_80a() {
 
 	return 0
 }
-run_test 80a "DNE: create remote dir, drop update rep from MDT1, fail MDT1"
+run_test 80a "DNE: create remote dir, drop update rep from MDT0, fail MDT0"
 
 test_80b() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
@@ -2072,11 +2072,11 @@ test_80b() {
 
 	mkdir -p $DIR/$tdir
 	#define OBD_FAIL_UPDATE_OBJ_NET_REP	0x1701
-	do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x1701
+	do_facet mds${MDTIDX} lctl set_param fail_loc=0x1701
 	$LFS mkdir -i $MDTIDX $remote_dir &
 	local CLIENT_PID=$!
 
-	fail mds${MDTIDX}
+	fail mds$((MDTIDX + 1))
 
 	wait $CLIENT_PID || error "remote creation failed"
 
@@ -2085,7 +2085,7 @@ test_80b() {
 
 	return 0
 }
-run_test 80b "DNE: create remote dir, drop update rep from MDT1, fail MDT0"
+run_test 80b "DNE: create remote dir, drop update rep from MDT0, fail MDT1"
 
 test_80c() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
@@ -2099,7 +2099,7 @@ test_80c() {
 
 	mkdir -p $DIR/$tdir
 	#define OBD_FAIL_UPDATE_OBJ_NET_REP	0x1701
-	do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x1701
+	do_facet mds${MDTIDX} lctl set_param fail_loc=0x1701
 	$LFS mkdir -i $MDTIDX $remote_dir &
 	local CLIENT_PID=$!
 
@@ -2122,10 +2122,13 @@ test_80d() {
 
 	mkdir -p $DIR/$tdir
 	#define OBD_FAIL_UPDATE_OBJ_NET_REP	0x1701
-	do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x1701
+	do_facet mds${MDTIDX} lctl set_param fail_loc=0x1701
 	$LFS mkdir -i $MDTIDX $remote_dir &
 	local CLIENT_PID=$!
 
+	# sleep 3 seconds to make sure MDTs are failed after
+	# lfs mkdir -i has finished on all of MDTs.
+	sleep 3
 	fail mds${MDTIDX},mds$((MDTIDX + 1))
 
 	wait $CLIENT_PID || error "remote creation failed"
@@ -2149,10 +2152,14 @@ test_80e() {
 
 	mkdir -p $DIR/$tdir
 	# OBD_FAIL_MDS_REINT_NET_REP       0x119
-	do_facet mds${MDTIDX} lctl set_param fail_loc=0x119
+	do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x119
 	$LFS mkdir -i $MDTIDX $remote_dir &
 	local CLIENT_PID=$!
 
+	# sleep 3 seconds to make sure MDTs are failed after
+	# lfs mkdir -i has finished on all of MDTs.
+	sleep 3
+
 	fail mds${MDTIDX}
 
 	wait $CLIENT_PID || error "remote creation failed"
@@ -2162,7 +2169,7 @@ test_80e() {
 
 	return 0
 }
-run_test 80e "DNE: create remote dir, drop MDT0 rep, fail MDT0"
+run_test 80e "DNE: create remote dir, drop MDT1 rep, fail MDT0"
 
 test_80f() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
@@ -2175,7 +2182,7 @@ test_80f() {
 
 	mkdir -p $DIR/$tdir
 	# OBD_FAIL_MDS_REINT_NET_REP       0x119
-	do_facet mds${MDTIDX} lctl set_param fail_loc=0x119
+	do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x119
 	$LFS mkdir -i $MDTIDX $remote_dir &
 	local CLIENT_PID=$!
 
@@ -2188,7 +2195,7 @@ test_80f() {
 
 	return 0
 }
-run_test 80f "DNE: create remote dir, drop MDT0 rep, fail MDT1"
+run_test 80f "DNE: create remote dir, drop MDT1 rep, fail MDT1"
 
 test_80g() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
@@ -2202,10 +2209,14 @@ test_80g() {
 
 	mkdir -p $DIR/$tdir
 	# OBD_FAIL_MDS_REINT_NET_REP       0x119
-	do_facet mds${MDTIDX} lctl set_param fail_loc=0x119
+	do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x119
 	$LFS mkdir -i $MDTIDX $remote_dir &
 	local CLIENT_PID=$!
 
+	# sleep 3 seconds to make sure MDTs are failed after
+	# lfs mkdir -i has finished on all of MDTs.
+	sleep 3
+
 	fail mds${MDTIDX}
 	fail mds$((MDTIDX + 1))
 
@@ -2216,7 +2227,7 @@ test_80g() {
 
 	return 0
 }
-run_test 80g "DNE: create remote dir, drop MDT0 rep, fail MDT0, then MDT1"
+run_test 80g "DNE: create remote dir, drop MDT1 rep, fail MDT0, then MDT1"
 
 test_80h() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
@@ -2225,10 +2236,14 @@ test_80h() {
 
 	mkdir -p $DIR/$tdir
 	# OBD_FAIL_MDS_REINT_NET_REP       0x119
-	do_facet mds${MDTIDX} lctl set_param fail_loc=0x119
+	do_facet mds$((MDTIDX + 1)) lctl set_param fail_loc=0x119
 	$LFS mkdir -i $MDTIDX $remote_dir &
 	local CLIENT_PID=$!
 
+	# sleep 3 seconds to make sure MDTs are failed after
+	# lfs mkdir -i has finished on all of MDTs.
+	sleep 3
+
 	fail mds${MDTIDX},mds$((MDTIDX + 1))
 
 	wait $CLIENT_PID || return 1
@@ -2238,7 +2253,7 @@ test_80h() {
 
 	return 0
 }
-run_test 80h "DNE: create remote dir, drop MDT0 rep, fail 2 MDTs"
+run_test 80h "DNE: create remote dir, drop MDT1 rep, fail 2 MDTs"
 
 test_81a() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0