X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fcmobd.sh;h=e456fe91f5ff60fe1457fd12f1906c4bfbec1416;hb=e52a140eb7f65a63f07dbb7e2aaff7f9e22974f2;hp=123f7efe4ba8553916f865ac27f5d15285d65b83;hpb=b258207ff5445ae0f1495968c7cb5b9dc7d66047;p=fs%2Flustre-release.git

diff --git a/lustre/tests/cmobd.sh b/lustre/tests/cmobd.sh
index 123f7ef..e456fe9 100644
--- a/lustre/tests/cmobd.sh
+++ b/lustre/tests/cmobd.sh
@@ -6,20 +6,18 @@ config=${1:-cmobd.xml}
 LMC=${LMC:-lmc}
 TMP=${TMP:-/tmp}
 
-CMOBD_MDS1=${CMOBD_MDS1:-"cmobd-mds1"}
-CMOBD_MDS2=${CMOBD_MDS2:-"cmobd-mds2"}
+COBD_MDS=${COBD_MDS:-"cobd_mds"}
+COBD_OST=${COBD_OST:-"cobd_ost"}
+CMOBD_MDS=${CMOBD_MDS:-"cmobd-mds"}
 
-MASTER_LMV=${MASTER_LMV1:-master-lmv1}
-
-CACHE_MDS1=${CACHE_MDS1:-"cache-mds1"}
-CACHE_MDS2=${CACHE_MDS2:-"cache-mds2"}
+MASTER_LMV=${MASTER_LMV:-master-lmv1}
 MASTER_MDS1=${MASTER_MDS1:-"master-mds1"}
 MASTER_MDS2=${MASTER_MDS2:-"master-mds2"}
+CACHE_MDS=${CACHE_MDS:-"cache-mds"}
 
-MDS1_CACHE_DEV=$TMP/mds1-cache-localhost
-MDS2_CACHE_DEV=$TMP/mds2-cache-localhost
 MDS1_MASTER_DEV=$TMP/mds1-master-localhost
 MDS2_MASTER_DEV=$TMP/mds2-master-localhost
+MDS_CACHE_DEV=$TMP/mds-cache-localhost
 
 MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"kml"}
 OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"kml"}
@@ -27,8 +25,11 @@ OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"kml"}
 MDSSIZE=${MDSSIZE:-100000}
 
 MASTER_LOV=${MASTER_LOV:-"master-lov1"}
+CACHE_LOV=${CACHE_LOV:-"cache-lov1"}
 MASTER_OST=${MASTER_OST:-"master-ost1"}
+CACHE_OST=${CACHE_OST:-"cache-ost1"}
 OST_MASTER_DEV=$TMP/ost1-master-localhost
+OST_CACHE_DEV=$TMP/ost1-cache-localhost
 
 OSTSIZE=${OSTSIZE:-100000}
 
@@ -37,16 +38,14 @@ OSDTYPE=${OSDTYPE:-obdfilter}
 OSTFAILOVER=${OSTFAILOVER:-}
 
 FSTYPE=${FSTYPE:-smfs}
-BACK_FSTYPE=${BACK_FSTYPE:-ext3}
+BACK_FSTYPE=${BACK_FSTYPE:-ldiskfs}
 
 NETTYPE=${NETTYPE:-tcp}
 NIDTYPE=${NIDTYPE:-$NETTYPE}
+STRIPE_SIZE=${STRIPE_SIZE:-65536}
 
 NODE=${NODE:-"localhost"}
 
-CLIENTS=${CLIENTS:-1}
-MODE=${MODE:-lmv}
-
 rm -f $config
 
 h2tcp () {
@@ -59,64 +58,32 @@ h2tcp () {
 ${LMC} -m $config --add net --node $NODE --nid `h2$NIDTYPE $NODE` \
 --nettype $NETTYPE || exit 1
 
-${LMC} -m $config --add mds --node $NODE --mds $CACHE_MDS1 --fstype $FSTYPE \
---backfstype $BACK_FSTYPE --backdev $MDS1_CACHE_DEV --dev $FSTYPE \
+${LMC} -m $config --add mds --node $NODE --mds $CACHE_MDS \
+--fstype $FSTYPE --backfstype $BACK_FSTYPE --dev $MDS_CACHE_DEV \
 --mountfsoptions $MDS_MOUNT_OPTS --size $MDSSIZE --format || exit 10
 
-if test "x$CLIENTS" = "x2"; then
-        ${LMC} -m $config --add mds --node $NODE --mds $CACHE_MDS2 \
-        --fstype $FSTYPE --backfstype $BACK_FSTYPE --backdev $MDS2_CACHE_DEV \
-        --dev $FSTYPE --mountfsoptions $MDS_MOUNT_OPTS --size $MDSSIZE --format || exit 10
-fi
-
-if test "x$MODE" = "xmds"; then
-        ${LMC} -m $config --add mds --node $NODE --mds $MASTER_MDS1 \
-        --fstype $BACK_FSTYPE --dev $MDS1_MASTER_DEV --size $MDSSIZE --format || exit 10
-else
-        ${LMC} -m $config --add lmv --lmv $MASTER_LMV || exit 12
-
-        ${LMC} -m $config --add mds --node $NODE --mds $MASTER_MDS1 \
-        --fstype $BACK_FSTYPE --dev $MDS1_MASTER_DEV --size $MDSSIZE \
-        --lmv $MASTER_LMV --format || exit 10
-
-        ${LMC} -m $config --add mds --node $NODE --mds $MASTER_MDS2 \
-        --fstype $BACK_FSTYPE --dev $MDS2_MASTER_DEV --size $MDSSIZE \
-        --lmv $MASTER_LMV --format || exit 10
-fi
-
-if test "x$MODE" = "xmds"; then
-        ${LMC} -m $config --add lov --lov $MASTER_LOV --mds $MASTER_MDS1 \
-        --stripe_sz 65536 --stripe_cnt $STRIPECNT --stripe_pattern 0 || exit 20
-else
-        ${LMC} -m $config --add lov --lov $MASTER_LOV --lmv $MASTER_LMV \
-        --stripe_sz 65536 --stripe_cnt $STRIPECNT --stripe_pattern 0 || exit 20
-fi
-
-${LMC} -m $config --add ost --ost $MASTER_OST --node $NODE --lov $MASTER_LOV \
---fstype $BACK_FSTYPE --dev $OST_MASTER_DEV --size $OSTSIZE  || exit 21
-
-if test "x$MODE" = "xmds"; then
-        ${LMC} -m $config --add cmobd --node $NODE --cmobd $CMOBD_MDS1 \
-        --master_obd $MASTER_MDS1 --cache_obd $CACHE_MDS1 || exit 23 
-else
-        ${LMC} -m $config --add cmobd --node $NODE --cmobd $CMOBD_MDS1 \
-        --master_obd $MASTER_LMV --cache_obd $CACHE_MDS1 || exit 23 
-fi
-
-if test "x$CLIENTS" = "x2"; then
-        if test "x$MODE" = "xmds"; then
-                ${LMC} -m $config --add cmobd --node $NODE --cmobd $CMOBD_MDS2 \
-                --master_obd $MASTER_MDS1 --cache_obd $CACHE_MDS2 || exit 23 
-        else
-                ${LMC} -m $config --add cmobd --node $NODE --cmobd $CMOBD_MDS2 \
-                --master_obd $MASTER_LMV --cache_obd $CACHE_MDS2 || exit 23 
-        fi
-fi
+${LMC} -m $config --add lmv --lmv $MASTER_LMV || exit 12
+
+${LMC} -m $config --add mds --node $NODE --mds $MASTER_MDS1 \
+--fstype $BACK_FSTYPE --dev $MDS1_MASTER_DEV --size $MDSSIZE \
+--lmv $MASTER_LMV --format || exit 10
+
+${LMC} -m $config --add mds --node $NODE --mds $MASTER_MDS2 \
+--fstype $BACK_FSTYPE --dev $MDS2_MASTER_DEV --size $MDSSIZE \
+--lmv $MASTER_LMV --format || exit 10
+
+${LMC} -m $config --add lov --lov $CACHE_LOV --mds $CACHE_MDS --aware $MASTER_LMV \
+--stripe_sz $STRIPE_SIZE --stripe_cnt $STRIPECNT --stripe_pattern 0 || exit 20
+
+${LMC} -m $config --add ost --ost $CACHE_OST --node $NODE --lov $CACHE_LOV \
+--fstype $BACK_FSTYPE --dev $OST_CACHE_DEV --size $OSTSIZE  || exit 21
+
+${LMC} -m $config --add cobd --node $NODE --cobd $COBD_MDS \
+--master_obd $MASTER_LMV --cache_obd $CACHE_MDS || exit 22
 
 ${LMC} -m $config --add mtpt --node $NODE --path /mnt/lustre \
---mds $CACHE_MDS1 --lov $MASTER_LOV || exit 30
+--lmv $COBD_MDS --lov $CACHE_LOV || exit 30
+
+${LMC} -m $config --add cmobd --node $NODE --cmobd $CMOBD_MDS \
+--master_obd $MASTER_LMV --cache_obd $CACHE_MDS || exit 23
 
-if test "x$CLIENTS" = "x2"; then
-        ${LMC} -m $config --add mtpt --node $NODE --path /mnt/lustre1 \
-        --mds $CACHE_MDS2 --lov $MASTER_LOV || exit 30
-fi