X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Freplay-single.sh;h=726d77372e3b3d13beeda8efb88131e39d09f4a8;hp=c5759dc8db44091ca646617bfb786c836f6990b9;hb=ca754ec8b43416d41bbd401bad7d9f93746fb867;hpb=771630a718aa33d03879fefa17242c61df530f74

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index c5759dc..726d773 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -473,7 +473,7 @@ test_20b() { # bug 10480
 
 	dd if=/dev/zero of=$DIR/$tfile bs=4k count=10000 &
 	while [ ! -e $DIR/$tfile ] ; do
-		usleep 60			# give dd a chance to start
+		sleep 0.01			# give dd a chance to start
 	done
 
 	$LFS getstripe $DIR/$tfile || error "$LFS getstripe $DIR/$tfile failed"
@@ -825,7 +825,7 @@ test_36() {
 	checkstat $DIR/$tfile
 	facet_failover $SINGLEMDS
 	cancel_lru_locks mdc
-	if dmesg | grep "unknown lock cookie"; then
+	if $LCTL dk | grep "stale lock .*cookie"; then
 		error "cancel after replay failed"
 	fi
 }
@@ -845,7 +845,7 @@ test_37() {
 	do_facet $SINGLEMDS dmesg -c >/dev/null
 	fail_abort $SINGLEMDS
 	kill -USR1 $pid || error "multiop $pid not running"
-	do_facet $SINGLEMDS dmesg | grep "error .* unlinking .* from PENDING" &&
+	do_facet $SINGLEMDS dmesg | grep "error unlinking orphan" &&
 		error "error unlinking files"
 	wait $pid || error "multiop $pid failed"
 	sync
@@ -1103,12 +1103,12 @@ test_45() {
 run_test 45 "Handle failed close"
 
 test_46() {
-	dmesg -c >/dev/null
 	drop_reply "touch $DIR/$tfile"
 	fail $SINGLEMDS
 	# ironically, the previous test, 45, will cause a real forced close,
 	# so just look for one for this test
-	dmesg | grep -i "force closing client file handle for $tfile" &&
+	local FID=$($LFS path2fid $tfile)
+	$LCTL dk | grep -i "force closing file handle $FID" &&
 		error "found force closing in dmesg"
 	return 0
 }
@@ -1821,7 +1821,7 @@ test_65a() #bug 3055
     createmany -o $DIR/$tfile 10 > /dev/null
     unlinkmany $DIR/$tfile 10 > /dev/null
     # check for log message
-    $LCTL dk | grep "Early reply #" || error "No early reply"
+    $LCTL dk | grep -i "Early reply #" || error "No early reply"
     debugrestore
     # client should show REQ_DELAY estimates
     lctl get_param -n mdc.${FSNAME}-MDT0000-mdc-*.timeouts | grep portal
@@ -1861,7 +1861,7 @@ test_65b() #bug 3055
 
 	do_facet ost1 $LCTL set_param fail_loc=0
 	# check for log message
-	$LCTL dk | grep "Early reply #" || error "No early reply"
+	$LCTL dk | grep -i "Early reply #" || error "No early reply"
 	debugrestore
 	# client should show REQ_DELAY estimates
 	lctl get_param -n osc.${FSNAME}-OST0000-osc-*.timeouts | grep portal
@@ -3110,10 +3110,6 @@ test_85b() { #bug 16774
 
 	lctl set_param -n ldlm.cancel_unused_locks_before_replay "1"
 
-	if ! combined_mgs_mds ; then
-		mount_mgs_client
-	fi
-
 	$LFS setstripe -c 1 -i 0 $DIR/$tdir
 
 	for i in $(seq 100); do
@@ -3141,10 +3137,6 @@ test_85b() { #bug 16774
 		 -n ldlm.namespaces.*OST0000*$addr.lock_unused_count)
 	echo "after recovery: unused locks count = $count2"
 
-	if ! combined_mgs_mds ; then
-		umount_mgs_client
-	fi
-
 	if [ $count2 -ge $count ]; then
 		error "unused locks are not canceled"
 	fi
@@ -4836,8 +4828,8 @@ test_131b() {
 run_test 131b "DoM file write replay"
 
 test_132a() {
-	[ "$MDS1_VERSION" -lt $(version_code 2.9.90) ] &&
-		skip "Do not support PFL files before 2.10"
+	[ "$MDS1_VERSION" -lt $(version_code 2.12.0) ] &&
+		skip "Need MDS version 2.12.0 or later"
 
 	$LFS setstripe -E 1M -c 1 -E EOF -c 2 $DIR/$tfile
 	replay_barrier $SINGLEMDS
@@ -4902,16 +4894,19 @@ test_134() {
 	pool_add pool_134
 	pool_add_targets pool_134 1 1
 
-	mkdir $DIR/$tdir
-	$LFS setstripe -p pool_134 $DIR/$tdir
+	mkdir -p $DIR/$tdir/{A,B}
+	$LFS setstripe -p pool_134 $DIR/$tdir/A
+	$LFS setstripe -E EOF -p pool_134 $DIR/$tdir/B
 
 	replay_barrier mds1
 
-	touch $DIR/$tdir/$tfile
+	touch $DIR/$tdir/A/$tfile || error "touch non-pfl file failed"
+	touch $DIR/$tdir/B/$tfile || error "touch pfl failed"
 
 	fail mds1
 
-	[ -f $DIR/$tdir/$tfile ] || error "file does not exist"
+	[ -f $DIR/$tdir/A/$tfile ] || error "non-pfl file does not exist"
+	[ -f $DIR/$tdir/B/$tfile ] || error "pfl file does not exist"
 }
 run_test 134 "replay creation of a file created in a pool"