From e5d273a022243604c9dc22e33ad3eb282c02d4b2 Mon Sep 17 00:00:00 2001
From: Eric Mei <Eric.Mei@Sun.COM>
Date: Mon, 22 Feb 2010 14:20:21 -0800
Subject: [PATCH] b=21835 fix mdsrate script.

Fix mdsrate test script to also account in inodes numbers used by
test directories.

r=robert.read
---
 lustre/tests/mdsrate-create-large.sh  | 4 ++--
 lustre/tests/mdsrate-create-small.sh  | 4 ++--
 lustre/tests/mdsrate-lookup-10dirs.sh | 2 +-
 lustre/tests/mdsrate-lookup-1dir.sh   | 2 +-
 lustre/tests/mdsrate-stat-large.sh    | 2 +-
 lustre/tests/mdsrate-stat-small.sh    | 2 +-
 lustre/tests/test-framework.sh        | 4 ++++
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh
index 17e290e..aa99a1c 100644
--- a/lustre/tests/mdsrate-create-large.sh
+++ b/lustre/tests/mdsrate-create-large.sh
@@ -37,7 +37,7 @@ chmod 0777 $BASEDIR
 $LFS setstripe $BASEDIR -c -1
 get_stripe $BASEDIR
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
@@ -85,7 +85,7 @@ else
     rmdir $TESTDIR_SINGLE
 fi
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh
index c7ca1c7..03ca9bb 100644
--- a/lustre/tests/mdsrate-create-small.sh
+++ b/lustre/tests/mdsrate-create-small.sh
@@ -45,7 +45,7 @@ chmod 0777 $BASEDIR
 $LFS setstripe $BASEDIR -i 0 -c 1
 get_stripe $BASEDIR
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
@@ -98,7 +98,7 @@ else
     fi
 fi
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
diff --git a/lustre/tests/mdsrate-lookup-10dirs.sh b/lustre/tests/mdsrate-lookup-10dirs.sh
index d99c01b..946d587 100644
--- a/lustre/tests/mdsrate-lookup-10dirs.sh
+++ b/lustre/tests/mdsrate-lookup-10dirs.sh
@@ -43,7 +43,7 @@ chmod 0777 $BASEDIR
 $LFS setstripe $BASEDIR -c 1
 get_stripe $BASEDIR
 
-IFree=$(inodes_available)
+IFree=$(($(mdsrate_inodes_available) - NUM_DIRS))
 if [ $IFree -lt $((NUM_FILES * NUM_DIRS)) ]; then
     NUM_FILES=$((IFree / NUM_DIRS))
 fi
diff --git a/lustre/tests/mdsrate-lookup-1dir.sh b/lustre/tests/mdsrate-lookup-1dir.sh
index 291fd70..0a8ede4b 100644
--- a/lustre/tests/mdsrate-lookup-1dir.sh
+++ b/lustre/tests/mdsrate-lookup-1dir.sh
@@ -42,7 +42,7 @@ chmod 0777 $BASEDIR
 $LFS setstripe $BASEDIR -c 1
 get_stripe $BASEDIR
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
diff --git a/lustre/tests/mdsrate-stat-large.sh b/lustre/tests/mdsrate-stat-large.sh
index fef4381..5580985 100644
--- a/lustre/tests/mdsrate-stat-large.sh
+++ b/lustre/tests/mdsrate-stat-large.sh
@@ -47,7 +47,7 @@ chmod 0777 $BASEDIR
 $LFS setstripe $BASEDIR -c -1
 get_stripe $BASEDIR
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
diff --git a/lustre/tests/mdsrate-stat-small.sh b/lustre/tests/mdsrate-stat-small.sh
index 6de066a..50586ee 100644
--- a/lustre/tests/mdsrate-stat-small.sh
+++ b/lustre/tests/mdsrate-stat-small.sh
@@ -47,7 +47,7 @@ chmod 0777 $BASEDIR
 $LFS setstripe $BASEDIR -i 0 -c 1
 get_stripe $BASEDIR
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index be0a9ad..371e5e2 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -3058,6 +3058,10 @@ inodes_available () {
     echo $IFree
 }
 
+mdsrate_inodes_available () {
+    echo $(($(inodes_available) - 1))
+}
+
 # reset llite stat counters
 clear_llite_stats(){
         lctl set_param -n llite.*.stats 0
-- 
1.8.3.1