Revert my use of the configure_flags macro in the lustre.spec file and just

[fs/lustre-release.git] / lustre / tests / cmobd.sh

diff --git a/lustre/tests/cmobd.sh b/lustre/tests/cmobd.sh
index 807fde1..e456fe9 100644 (file)
--- a/lustre/tests/cmobd.sh
+++ b/lustre/tests/cmobd.sh
@@ -10,18 +10,14 @@ 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_LMV=${MASTER_LMV1:-cache-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"}
@@ -62,19 +58,10 @@ 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_MDS \
+--fstype $FSTYPE --backfstype $BACK_FSTYPE --dev $MDS_CACHE_DEV \
+--mountfsoptions $MDS_MOUNT_OPTS --size $MDSSIZE --format || exit 10
 
-#add cache lmv for cache lmv 
-${LMC} -m $config --add lmv --lmv $CACHE_LMV || exit 12
-
-${LMC} -m $config --add mds --node $NODE --mds $CACHE_MDS1 \
---fstype $FSTYPE --backfstype $BACK_FSTYPE --dev $MDS1_CACHE_DEV \
---mountfsoptions $MDS_MOUNT_OPTS --size $MDSSIZE --lmv $CACHE_LMV --format || exit 10
-
-${LMC} -m $config --add mds --node $NODE --mds $CACHE_MDS2 \
---fstype $FSTYPE --backfstype $BACK_FSTYPE --dev $MDS2_CACHE_DEV \
---mountfsoptions $MDS_MOUNT_OPTS --size $MDSSIZE --lmv $CACHE_LMV --format || exit 10
-
-#add master lmv for master lmv
 ${LMC} -m $config --add lmv --lmv $MASTER_LMV || exit 12
 
 ${LMC} -m $config --add mds --node $NODE --mds $MASTER_MDS1 \
@@ -85,18 +72,18 @@ ${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  --cachelmv $CACHE_LMV --masterlmv $MASTER_LMV \
+${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_LMV || exit 22
+--master_obd $MASTER_LMV --cache_obd $CACHE_MDS || exit 22
 
 ${LMC} -m $config --add mtpt --node $NODE --path /mnt/lustre \
 --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_MDS1 || exit 23
+--master_obd $MASTER_LMV --cache_obd $CACHE_MDS || exit 23