From: grev <grev>
Date: Wed, 23 Jul 2008 20:26:53 +0000 (+0000)
Subject: b=15817
X-Git-Tag: v1_7_72~1^88~4
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=77262b7ef4e9b725b62b9d9c2a3b4dcb5a872a8c;p=fs%2Flustre-release.git

b=15817
i=Adilger
process iozone log; fail if iozone is not complete
---

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index ea59da9..eba6dc1 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -161,13 +161,17 @@ for NAME in $CONFIGS; do
 		log "min OST has ${MIN}kB available, using ${SIZE}kB file size"
 		IOZONE_OPTS="-i 0 -i 1 -i 2 -e -+d -r $RSIZE -s $SIZE"
 		IOZFILE="$IOZDIR/iozone"
+		IOZLOG=$TMP/iozone.log
 		# $SPACE was calculated with all OSTs
 		$DEBUG_OFF
 		myUID=$RUNAS_ID
 		myRUNAS=$RUNAS
 		FAIL_ON_ERROR=false check_runas_id_ret $myUID $myRUNAS || { myRUNAS="" && myUID=$UID; }
 		chown $myUID:$myUID $IOZDIR
-		$myRUNAS iozone $IOZONE_OPTS -f $IOZFILE
+		$myRUNAS iozone $IOZONE_OPTS -f $IOZFILE 2>&1 | tee $IOZLOG
+		tail -1 $IOZLOG | grep -q complete || \
+			{ error "iozone (1) failed" && false; }
+		rm -f $IOZLOG
 		$DEBUG_ON
 		$CLEANUP
 		$SETUP
@@ -183,7 +187,10 @@ for NAME in $CONFIGS; do
 		if [ "$O_DIRECT" != "no" -a "$IOZONE_DIR" != "no" ]; then
 			$DEBUG_OFF
 			# cd TMP to have write permission for tmp file iozone writes
-			( cd $TMP && $myRUNAS iozone -I $IOZONE_OPTS $IOZFILE.odir )
+			( cd $TMP && $myRUNAS iozone -I $IOZONE_OPTS $IOZFILE.odir 2>&1 | tee $IOZLOG)
+			tail -1 $IOZLOG | grep -q complete || \
+				{ error "iozone (2) failed" && false; }
+			rm -f $IOZLOG
 			$DEBUG_ON
 			$CLEANUP
 			$SETUP
@@ -202,7 +209,10 @@ for NAME in $CONFIGS; do
 				IOZFILE="$IOZFILE $IOZDIR/iozone.$THREAD"
 				THREAD=$((THREAD + 1))
 			done
-			$myRUNAS iozone $IOZONE_OPTS -t $IOZ_THREADS $IOZFILE
+			$myRUNAS iozone $IOZONE_OPTS -t $IOZ_THREADS $IOZFILE 2>&1 | tee $IOZLOG
+			tail -1 $IOZLOG | grep -q complete || \
+				{ error "iozone (3) failed" && false; }
+			rm -f $IOZLOG
 			$DEBUG_ON
 			$CLEANUP
 			$SETUP