From: Niu Yawei <niu@whamcloud.com>
Date: Tue, 6 Nov 2012 04:02:23 +0000 (-0500)
Subject: LU-797 tests: improve test_23b of ost-pools.sh
X-Git-Tag: 2.3.58~54
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6dd41a43e3cdff1b2e0713cfc163734889d8650a

LU-797 tests: improve test_23b of ost-pools.sh

- fail the test once the written space is greater than the
  available space.
- use it's own maxfree limit, and increase the limit a lot.
- terminate the test when the write speed is too slow.

Test-Parameters: envdefinitions=SLOW=yes testlist=ost-pools
Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: Ib7deca89ebd7267fa7be0a51ceac01fe3cb2df65
Reviewed-on: http://review.whamcloud.com/4474
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Hudson
---

diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh
index f5f972f..ffa1506 100644
--- a/lustre/tests/ost-pools.sh
+++ b/lustre/tests/ost-pools.sh
@@ -1237,8 +1237,6 @@ test_23b() {
 
     local i=0
     local TGT
-    local BUNIT_SZ=1024  # min block quota unit(kB)
-    local LIMIT=$((BUNIT_SZ * (OSTCOUNT + 1)))
     local dir=$POOL_ROOT/dir
     local file="$dir/$tfile-quota"
 
@@ -1249,12 +1247,14 @@ test_23b() {
     add_pool $POOL "$FSNAME-OST[$TGT_FIRST-$TGT_MAX/3]" "$TGT"
     create_dir $dir $POOL
 
-    local AVAIL=$(lfs_df -p $POOL $dir | awk '/summary/ { print $4 }')
-    [ $AVAIL -gt $MAXFREE ] &&
-        skip_env "Filesystem space $AVAIL is larger than $MAXFREE limit" &&
-            return 0
-    log "OSTCOUNT=$OSTCOUNT, OSTSIZE=$OSTSIZE"
-    log "MAXFREE=$MAXFREE, AVAIL=$AVAIL, SLOW=$SLOW"
+	local maxfree=$((1024 * 1024 * 30)) # 30G
+	local AVAIL=$(lfs_df -p $POOL $dir | awk '/summary/ { print $4 }')
+	[ $AVAIL -gt $maxfree ] &&
+		skip_env "Filesystem space $AVAIL is larger than " \
+			"$maxfree limit" && return 0
+
+	echo "OSTCOUNT=$OSTCOUNT, OSTSIZE=$OSTSIZE, AVAIL=$AVAIL"
+	echo "MAXFREE=$maxfree, SLOW=$SLOW"
 
 	# XXX remove the interoperability code once we drop the old server
 	#     ( < 2.3.50) support.
@@ -1265,28 +1265,47 @@ test_23b() {
 		sleep 5
 	fi
 
-    chown $RUNAS_ID.$RUNAS_ID $dir
-    i=0
-    RC=0
-    while [ $RC -eq 0 ]; do
-        i=$((i + 1))
-        stat=$(LOCALE=C $RUNAS2 dd if=/dev/zero of=${file}$i bs=1M \
-               count=$((LIMIT * 4)) 2>&1)
-        RC=$?
-		echo "$i: $stat"
-        if [ $RC -eq 1 ]; then
-            echo $stat | grep -q "Disk quota exceeded"
-            [[ $? -eq 0 ]] && error "dd failed with EDQUOT with quota off"
-
-            echo $stat | grep -q "No space left on device"
-            [[ $? -ne 0 ]] &&
-                error "dd did not fail with ENOSPC"
-        fi
-    done
-
-    df -h
-
-    rm -rf $POOL_ROOT
+	chown $RUNAS_ID.$RUNAS_ID $dir
+	i=0
+	local RC=0
+	local TOTAL=0 # KB
+	local stime=$(date +%s)
+	local stat
+	local etime
+	local elapsed
+	local maxtime=300 # minimum speed: 5GB / 300sec ~= 17MB/s
+	while [ $RC -eq 0 ]; do
+		i=$((i + 1))
+		stat=$(LOCALE=C $RUNAS2 dd if=/dev/zero of=${file}$i bs=1M \
+			count=$((5 * 1024)) 2>&1)
+		RC=$?
+		TOTAL=$((TOTAL + 1024 * 1024 * 5))
+		echo "[$i iteration] $stat"
+		echo "total written: $TOTAL"
+
+		etime=$(date +%s)
+		elapsed=$((etime - stime))
+		echo "stime=$stime, etime=$etime, elapsed=$elapsed"
+
+		if [ $RC -eq 1 ]; then
+			echo $stat | grep -q "Disk quota exceeded"
+			[[ $? -eq 0 ]] &&
+				error "dd failed with EDQUOT with quota off"
+
+			echo $stat | grep -q "No space left on device"
+			[[ $? -ne 0 ]] &&
+				error "dd did not fail with ENOSPC"
+		elif [ $TOTAL -gt $AVAIL ]; then
+			error "dd didn't fail with ENOSPC ($TOTAL > $AVAIL)"
+		elif [ $i -eq 1 -a $elapsed -gt $maxtime ]; then
+			log "The first 5G write used $elapsed (> $maxtime) " \
+				"seconds, terminated"
+			RC=1
+		fi
+	done
+
+	df -h
+	rm -rf $POOL_ROOT
 }
 run_test 23b "OST pools and OOS"