X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_dd.sh;h=e805f62d3fe73491ccd2b1f05b886160b0504d74;hb=66c08998491c149db2e908daf03bb3296eccda45;hp=8e1cfddfd42b6bb8647c9928c80ff2f1b134bd2c;hpb=a6e6e1557180f89f0360e3cb9b9e32b465114b5f;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run_dd.sh b/lustre/tests/run_dd.sh
index 8e1cfdd..e805f62 100755
--- a/lustre/tests/run_dd.sh
+++ b/lustre/tests/run_dd.sh
@@ -32,17 +32,17 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
 	mkdir -p $TESTDIR
 	$LFS setstripe -c -1 $TESTDIR
 	cd $TESTDIR
+	sync
+
 	# suppress dd xfer stat to workaround buggy coreutils/gettext
 	# combination in RHEL5 and OEL5, see BZ 21264
-	FREE_SPACE=$($LFS df $TESTDIR|awk '/filesystem summary:/ {print $5}')
+	FREE_SPACE=$(df -P $TESTDIR | awk '/:/ { print $4 }')
 	BLKS=$((FREE_SPACE * 9 / 40 / CLIENT_COUNT))
 	echoerr "Total free disk space is $FREE_SPACE, 4k blocks to dd is $BLKS"
 
+	df $TESTDIR || true
 	dd bs=4k count=$BLKS status=noxfer if=/dev/zero of=$TESTDIR/dd-file \
-								1>$LOG &
-	load_pid=$!
-	wait $load_pid
-
+								1>$LOG
 	if [ $? -eq 0 ]; then
 		echoerr "$(date +'%F %H:%M:%S'): dd succeeded"
 		cd $TMP
@@ -50,7 +50,7 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
 		echoerr "$(date +'%F %H:%M:%S'): dd run finished"
 	else
 		echoerr "$(date +'%F %H:%M:%S'): dd failed"
-        	if [ -z "$ERRORS_OK" ]; then
+		if [ -z "$ERRORS_OK" ]; then
 			echo $(hostname) >> $END_RUN_FILE
 		fi
 		if [ $BREAK_ON_ERROR ]; then