X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fcobd.sh;h=cc74e41bac99e9e9e205666e41b03d72b503e07b;hb=439addad84514e7ff6452710e6a7f15b80d7b589;hp=983df937c2e853711e3de4f733e9ec76abdf39a9;hpb=a2a0746305449dbd925879b14dc2c0d6040bb8bf;p=fs%2Flustre-release.git

diff --git a/lustre/tests/cobd.sh b/lustre/tests/cobd.sh
index 983df93..cc74e41 100755
--- a/lustre/tests/cobd.sh
+++ b/lustre/tests/cobd.sh
@@ -1,32 +1,79 @@
 #!/bin/bash
 
+export PATH=`dirname $0`/../utils:$PATH
 
-config=${1:-$(basename $0 .sh)}.xml
-
-LMC=${LMC:-../utils/lmc -m $config}
+config=${1:-cobd.xml}
+LMC=${LMC:-lmc}
 TMP=${TMP:-/tmp}
 
-MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
-MDSSIZE=50000
-FSTYPE=${FSTYPE:-ext3}
+COBD_MDS=${COBD_MDS:-"cobd1"}
+COBD_OST=${COBD_OST:-"cobd2"}
+
+CACHE_MDS=${CACHE_MDS:-"mds1"}
+MASTER_MDS=${MASTER_MDS:-"mds2"}
+MDS_CACHE_DEV=$TMP/mds1-`hostname`
+MDS_MASTER_DEV=$TMP/mds2-`hostname`
+MDSSIZE=${MDSSIZE:-100000}
+
+CACHE_LOV=${CACHE_LOV:-"lov1"}
+MASTER_LOV=${MASTER_LOV:-"lov2"}
+
+CACHE_OST=${CACHE_OST:-"ost1"}
+MASTER_OST=${MASTER_OST:-"ost2"}
+OST_CACHE_DEV=$TMP/ost1-`hostname`
+OST_MASTER_DEV=$TMP/ost2-`hostname`
+OSTSIZE=${OSTSIZE:-100000}
+
+STRIPECNT=${STRIPECNT:-1}
+OSDTYPE=${OSDTYPE:-obdfilter}
+OSTFAILOVER=${OSTFAILOVER:-}
+
+FSTYPE=${FSTYPE:-smfs}
+BACK_FSTYPE=${BACK_FSTYPE:-ldiskfs}
+
+NETTYPE=${NETTYPE:-tcp}
+NIDTYPE=${NIDTYPE:-$NETTYPE}
 
-OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
-OSTSIZE=200000
+MDSNODE=${MDSNODE:-`hostname`}
+OSTNODE=${OSTNODE:-`hostname`}
+CLIENT=${CLIENT:-`hostname`}
+NODE=${NODE:-`hostname`}
+
+MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"kml"}
+OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"kml"}
 
 rm -f $config
+
+h2tcp () {
+	case $1 in
+	client) echo '\*' ;;
+	*) echo $1 ;;
+	esac
+}
+
 # create nodes
-${LMC} --add node --node localhost || exit 10
-${LMC} --add net --node  localhost --nid localhost --nettype tcp || exit 11
+${LMC} -m $config --add net --node $NODE --nid `h2$NIDTYPE $NODE` --nettype $NETTYPE || exit 1
+
+${LMC} -m $config --format --add mds --node $MDSNODE --mds $CACHE_MDS --fstype $FSTYPE \
+--backfstype $BACK_FSTYPE --dev $MDS_CACHE_DEV --mountfsoptions $MDS_MOUNT_OPTS --size $MDSSIZE ||exit 10
+
+${LMC} -m $config --format --add mds --node $MDSNODE --mds $MASTER_MDS --fstype $BACK_FSTYPE \
+--dev $MDS_MASTER_DEV --size $MDSSIZE || exit 10
+
+${LMC} -m $config --add lov --lov $CACHE_LOV --mds $CACHE_MDS \
+--stripe_sz 65536 --stripe_cnt $STRIPECNT --stripe_pattern 0 || exit 20
+
+${LMC} -m $config --add lov --lov $MASTER_LOV --mds $MASTER_MDS \
+--stripe_sz 65536 --stripe_cnt $STRIPECNT --stripe_pattern 0 || exit 20
 
-# configure mds server
-${LMC}  --add mds  --node localhost --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE || exit 20
+${LMC} -m $config --add ost --node $NODE --lov $CACHE_LOV \
+--fstype $FSTYPE --dev $OST_CACHE_DEV --backfstype $BACK_FSTYPE \
+--mountfsoptions $OST_MOUNT_OPTS --size $OSTSIZE  || exit 21
 
-# configure ost
-${LMC} --add ost --node localhost --obd obd1 --fstype $FSTYPE --obdtype obdecho || exit 30
-# configure ost
-${LMC} --add ost --node localhost --obd obd2 --fstype $FSTYPE --obdtype obdecho || exit 30
+${LMC} -m $config --add ost --node $NODE --lov $MASTER_LOV \
+--fstype $BACK_FSTYPE --dev $OST_MASTER_DEV --size $OSTSIZE  || exit 21
 
-${LMC} --add cobd --node localhost --real_obd obd1 --cache_obd obd2
+${LMC} -m $config --add cobd --node $NODE --cobd $COBD_OST --master_obd $MASTER_LOV --cache_obd $CACHE_LOV || exit 22 
+${LMC} -m $config --add cobd --node $NODE --cobd $COBD_MDS --master_obd $MASTER_MDS --cache_obd $CACHE_MDS || exit 22
 
-# create client config
-# ${LMC} -m $config --add mtpt --node localhost --path /mnt/lustre --mds mds1 --obd obd1 || exit 40
+${LMC} -m $config --add mtpt --node $NODE --path /mnt/lustre --mds $COBD_MDS --lov $COBD_OST || exit 30