LU-1526 tests: add --index support to the test framework

This patch improves mkfs_opts() in test-framework.sh to
add --index option for MDT and OST targets automatically.

Signed-off-by: Yu Jian <yujian@whamcloud.com>
Change-Id: Ic00bf4c498b336e283ae86e4543f43709eda01aa
Reviewed-on: http://review.whamcloud.com/4893
Tested-by: Hudson
Reviewed-by: Li Wei <wei.g.li@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 9736f4e..b3bff9e 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1873,9 +1873,21 @@ combined_mgs_mds () {
     [[ $MDSDEV = $MGSDEV ]] && [[ $mds_HOST = $mgs_HOST ]]
 }
 
-mkfs_opts () {
+facet_number() {
     local facet=$1
 
+    local number=$(echo -n $facet | sed -e 's/^fs[0-9]\+//' |
+                   sed -e 's/^[a-z]\+//')
+
+    [[ -z $number ]] && number=1
+
+    echo -n $number
+}
+
+mkfs_opts() {
+    local facet=$1
+
+    local index=$(($(facet_number $facet) - 1))
     local tgt=$(echo $facet | tr -d [:digit:] | tr "[:lower:]" "[:upper:]")
     local optvar=${tgt}_MKFS_OPTS
     local opt=${!optvar}
@@ -1883,6 +1895,9 @@ mkfs_opts () {
     # FIXME: ! combo  mgs/mds + mgsfailover is not supported yet
     [[ $facet = mgs ]] && echo $opt && return
 
+    # --index option
+    [[ $opt != *--index* ]] && opt+=" --index=$index"
+
     # 1.
     # --failnode options
     local var=${facet}failover_HOST