From dd984caec5ab72494c3dc4bfc96f7569401c1035 Mon Sep 17 00:00:00 2001
From: zhanghc <zhanghc>
Date: Mon, 30 Mar 2009 09:26:06 +0000
Subject: [PATCH] b=17710

fixup a bug in the original patch
in test_49 of conf-sanity

i=grev
---
 lustre/tests/conf-sanity.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 34ccef3..fd583c8 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1612,11 +1612,9 @@ run_test 48 "too many acls on file"
 test_49() { # bug 17710
 	local OLD_MDS_MKFS_OPTS=$MDS_MKFS_OPTS
 	local OLD_OST_MKFS_OPTS=$OST_MKFS_OPTS
-	local OLD_TIMEOUT=$TIMEOUT
+	local LOCAL_TIMEOUT=20
 
-	TIMEOUT=20
-
-	MDS_MKFS_OPTS="--mgs --mdt --fsname=$FSNAME --device-size=$MDSSIZE --param sys.timeout=$TIMEOUT --param sys.ldlm_timeout=$TIMEOUT $MKFSOPT $MDSOPT"
+	OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$LOCAL_TIMEOUT --param sys.ldlm_timeout=$LOCAL_TIMEOUT $MKFSOPT $OSTOPT"
 
 	reformat
 	start_mds
@@ -1630,10 +1628,10 @@ test_49() { # bug 17710
 	LDLM_CLIENT="`do_facet client lctl get_param -n ldlm_timeout`"
 
 	if [ $LDLM_MDS -ne $LDLM_OST1 ] || [ $LDLM_MDS -ne $LDLM_CLIENT ]; then
-		error "Different LDLM_TIMEOUT: $LDLM_MDS $LDLM_OST $LDLM_CLIENT"
+		error "Different LDLM_TIMEOUT:$LDLM_MDS $LDLM_OST1 $LDLM_CLIENT"
 	fi
 
-	if [ $LDLM_MDS -ne $((TIMEOUT / 3)) ]; then
+	if [ $LDLM_MDS -ne $((LOCAL_TIMEOUT / 3)) ]; then
 		error "LDLM_TIMEOUT($LDLM_MDS) is not correct"
 	fi
 
@@ -1641,7 +1639,7 @@ test_49() { # bug 17710
 	stop_ost || return 2
 	stop_mds || return 3
 
-	OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$TIMEOUT --param sys.ldlm_timeout=$((TIMEOUT - 1)) $MKFSOPT $OSTOPT"
+	OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$LOCAL_TIMEOUT --param sys.ldlm_timeout=$((LOCAL_TIMEOUT - 1)) $MKFSOPT $OSTOPT"
 	
 	reformat
 	start_mds || return 4
@@ -1654,10 +1652,10 @@ test_49() { # bug 17710
 	LDLM_CLIENT="`do_facet client lctl get_param -n ldlm_timeout`"
 
 	if [ $LDLM_MDS -ne $LDLM_OST1 ] || [ $LDLM_MDS -ne $LDLM_CLIENT ]; then
-		error "Different LDLM_TIMEOUT: $LDLM_MDS $LDLM_OST $LDLM_CLIENT"
+		error "Different LDLM_TIMEOUT:$LDLM_MDS $LDLM_OST1 $LDLM_CLIENT"
 	fi
 	
-	if [ $LDLM_MDS -ne $((TIMEOUT - 1)) ]; then
+	if [ $LDLM_MDS -ne $((LOCAL_TIMEOUT - 1)) ]; then
 		error "LDLM_TIMEOUT($LDLM_MDS) is not correct"
 	fi
 		
-- 
1.8.3.1