From: Niu Yawei <niu@whamcloud.com>
Date: Tue, 19 Apr 2011 04:12:09 +0000 (-0700)
Subject: LU-202 fix the test_23 of sanity-quota.sh
X-Git-Tag: 2.0.60.0~19
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=1d0bf2a777010fcc3316be061d7e26367c36f475

LU-202 fix the test_23 of sanity-quota.sh

test_23() uses a constant value(120000 = ~120M) to check if the
system has enough space to finish the test, so in the large OSTCOUNT
testing environment, the test will fail for short of disk space.

Changes of this patch are:
- Use a reasonable value to check free space instead of magic 120000;
- Specify the stripe index of test file for test_9 and test_23;

Issue:
Signed-off-by: Niu Yawei <niu@whamcloud.com>
Change-Id: If7cd01b7ce9dc025a0f1b8b70fa9214d70182a86
Reviewed-on: http://review.whamcloud.com/434
Tested-by: Hudson
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
Reviewed-by: Fan Yong <yong.fan@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index cb0241c..4dfd603 100644
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -956,7 +956,7 @@ GB=$((KB * 1024 * 1024))
 # inode->i_blkbits = min(PTLRPC_MAX_BRW_BITS+1, LL_MAX_BLKSIZE_BITS);
 blksize=$((1 << 21)) # 2Mb
 size_file=$((GB * 9 / 2))
-# this check is just for test9 and test10
+# this check is just for test_9
 OST0_MIN=4900000 #4.67G
 check_whether_skip () {
     OST0_SIZE=`$LFS df $DIR | awk '/\[OST:0\]/ {print $4}'`
@@ -994,7 +994,7 @@ test_9() {
         quota_show_check a g $TSTUSR
 
         echo "  Set stripe"
-	$LFS setstripe $TESTFILE -c 1
+	$LFS setstripe $TESTFILE -c 1 -i 0
         touch $TESTFILE
         chown $TSTUSR.$TSTUSR $TESTFILE
 
@@ -1715,7 +1715,7 @@ test_23_sub() {
 	sleep 3
         quota_show_check b u $TSTUSR
 
-	$LFS setstripe $TESTFILE -c 1
+	$LFS setstripe $TESTFILE -c 1 -i 0
 	chown $TSTUSR.$TSTUSR $TESTFILE
 
 	log "    Step1: trigger quota with 0_DIRECT"
@@ -1744,13 +1744,17 @@ test_23_sub() {
 }
 
 test_23() {
-	log "run for $((OSTCOUNT * 4))MB test file"
-	test_23_sub $((OSTCOUNT * 4 * 1024))
+        local slave_cnt=$((OSTCOUNT + 1)) # 1 mds, n osts
+
+        OST0_MIN=$((6 * $slave_cnt * 1024)) # extra space for meta blocks.
+	check_whether_skip && return 0
+	log "run for $((4 * $slave_cnt))MB test file"
+	test_23_sub $((4 * $slave_cnt * 1024))
 
-	OST0_MIN=120000
+	OST0_MIN=$((60 * $slave_cnt * 1024)) # extra space for meta blocks.
 	check_whether_skip && return 0
-	log "run for $((OSTCOUNT * 40))MB test file"
-	test_23_sub $((OSTCOUNT * 40 * 1024))
+	log "run for $((40 * $slave_cnt))MB test file"
+	test_23_sub $((40 * $slave_cnt * 1024))
 }
 run_test_with_stat 23 "run for fixing bug16125 ==========="