From: wang di <di.wang@intel.com>
Date: Sat, 25 Jan 2014 00:35:51 +0000 (-0800)
Subject: LU-3131 tests: fix sanity 56u/102k for single OST.
X-Git-Tag: 2.3.65~96
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=57841b254cd4f80c0c1a85f6c3116e48b13e9db0

LU-3131 tests: fix sanity 56u/102k for single OST.

sanity 56u and 102k should check OSTCOUNT before setstripe,
in case there are only one OST.

Signed-off-by: wang di <di.wang@intel.com>
Change-Id: I5efd9b8c1cb25f68a48728dee1cdf44a71d13b49
Reviewed-on: http://review.whamcloud.com/6001
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index f206bea..2282370 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -4302,11 +4302,13 @@ test_56u() { # LU-611
 	[ $NUMS -eq $EXPECTED ] ||
 		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
 
-	EXPECTED=$(((NUMDIRS + 1) * NUMFILES + ONESTRIPE))
-	CMD="$LFIND -stripe-index 0,1 -type f $TDIR"
-	NUMS=$($CMD | wc -l)
-	[ $NUMS -eq $EXPECTED ] ||
-		error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+	if [ $OSTCOUNT -gt 1 ]; then
+		EXPECTED=$(((NUMDIRS + 1) * NUMFILES + ONESTRIPE))
+		CMD="$LFIND -stripe-index 0,1 -type f $TDIR"
+		NUMS=$($CMD | wc -l)
+		[ $NUMS -eq $EXPECTED ] ||
+			error "\"$CMD\" wrong: found $NUMS, expected $EXPECTED"
+	fi
 }
 run_test 56u "check lfs find -stripe-index works"
 
@@ -6209,7 +6211,7 @@ test_102k() {
         local default_size=`$GETSTRIPE -S $test_kdir`
         local default_count=`$GETSTRIPE -c $test_kdir`
         local default_offset=`$GETSTRIPE -i $test_kdir`
-        $SETSTRIPE -S 65536 -i 1 -c $OSTCOUNT $test_kdir ||
+	$SETSTRIPE -S 65536 -i 0 -c $OSTCOUNT $test_kdir ||
                 error 'dir setstripe failed'
         setfattr -n trusted.lov $test_kdir
         local stripe_size=`$GETSTRIPE -S $test_kdir`