From 6f30c4a1bccd877410ab6a5d236b6427c279d452 Mon Sep 17 00:00:00 2001 From: yury Date: Wed, 13 Jul 2005 16:23:33 +0000 Subject: [PATCH] - changes in cmobd.sh - there should not be cache LMV - fixes in lmc --- lustre/cmobd/cm_obd.c | 2 +- lustre/cobd/cache_obd.c | 4 ++-- lustre/tests/cmobd.sh | 31 ++++++++++--------------------- lustre/utils/lmc | 35 ++++++++++++++++++++++++++++------- 4 files changed, 41 insertions(+), 31 deletions(-) diff --git a/lustre/cmobd/cm_obd.c b/lustre/cmobd/cm_obd.c index e8124a7..c3065df 100644 --- a/lustre/cmobd/cm_obd.c +++ b/lustre/cmobd/cm_obd.c @@ -199,7 +199,7 @@ static int cmobd_setup(struct obd_device *obd, obd_count len, void *buf) rc); GOTO(put_cache, rc); } - + if (cmobd_dt_obd(cmobd->master_exp->exp_obd)) { /* for master dt device remove the recovery flag. */ rc = obd_set_info(cmobd->master_exp, strlen("unrecovery"), diff --git a/lustre/cobd/cache_obd.c b/lustre/cobd/cache_obd.c index dc0902c..8f063e3 100644 --- a/lustre/cobd/cache_obd.c +++ b/lustre/cobd/cache_obd.c @@ -296,8 +296,8 @@ cobd_disconnect(struct obd_export *exp, unsigned long flags) LASSERT(exp != NULL); obd = class_exp2obd(exp); if (obd == NULL) { - CDEBUG(D_IOCTL, "invalid client cookie "LPX64"\n", - exp->exp_handle.h_cookie); + CDEBUG(D_IOCTL, "invalid client cookie " + LPX64"\n", exp->exp_handle.h_cookie); RETURN(-EINVAL); } cobd_exp = cobd_get_exp(obd); diff --git a/lustre/tests/cmobd.sh b/lustre/tests/cmobd.sh index 807fde1..22d598a 100644 --- 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"} @@ -63,18 +59,11 @@ ${LMC} -m $config --add net --node $NODE --nid `h2$NIDTYPE $NODE` \ --nettype $NETTYPE || exit 1 -#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 +${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 master lmv for master lmv +#add master lmv ${LMC} -m $config --add lmv --lmv $MASTER_LMV || exit 12 ${LMC} -m $config --add mds --node $NODE --mds $MASTER_MDS1 \ @@ -85,18 +74,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 --masterlmv $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 diff --git a/lustre/utils/lmc b/lustre/utils/lmc index 93c13b9..620936a 100755 --- a/lustre/utils/lmc +++ b/lustre/utils/lmc @@ -1255,12 +1255,10 @@ def add_cobd(gen, lustre, options): master_name = get_option(options, 'master_obd') cache_name = get_option(options, 'cache_obd') + # init master master_uuid = name2uuid(lustre, master_name, tag='lov', fatal=0) - cache_uuid = name2uuid(lustre, cache_name, tag='lov', fatal=0) - - if not master_uuid or not cache_uuid: + if not master_uuid: master_uuid = name2uuid(lustre, master_name, tag='ost', fatal=0) - cache_uuid = name2uuid(lustre, cache_name, tag='ost', fatal=0) if master_uuid: node = lookup(lustre, master_uuid) @@ -1275,6 +1273,11 @@ def add_cobd(gen, lustre, options): if not osd_node.getElementsByTagName('obdtype'): gen.addElement(osd_node, 'obdtype', 'master') + # init cache + cache_uuid = name2uuid(lustre, cache_name, tag='lov', fatal=0) + if not not cache_uuid: + cache_uuid = name2uuid(lustre, cache_name, tag='ost', fatal=0) + if cache_uuid: node = lookup(lustre, cache_uuid) rets = node.getElementsByTagName('lov_tgt') @@ -1289,8 +1292,10 @@ def add_cobd(gen, lustre, options): gen.addElement(osd_node, 'obdtype', 'cache') if not master_uuid or not cache_uuid: - master_uuid = name2uuid(lustre,master_name, tag='lmv') - cache_uuid = name2uuid(lustre,cache_name, tag='lmv') + master_uuid = name2uuid(lustre, master_name, tag='lmv', fatal=0) + if not master_uuid: + master_uuid = name2uuid(lustre, master_name, tag='mds', fatal=0) + if master_uuid: mds_node = lookup(lustre, master_uuid) ret = mds_node.getElementsByTagName('active_ref') @@ -1299,6 +1304,11 @@ def add_cobd(gen, lustre, options): mdsdev_node = lookup(lustre, mdsdev_uuid) if not mdsdev_node.getElementsByTagName('obdtype'): gen.addElement(mdsdev_node, 'obdtype', 'master') + + cache_uuid = name2uuid(lustre, cache_name, tag='lmv', fatal=0) + if not cache_uuid: + cache_uuid = name2uuid(lustre, cache_name, tag='mds', fatal=0) + if cache_uuid: mds_node = lookup(lustre, cache_uuid) ret = mds_node.getElementsByTagName('active_ref') @@ -1308,6 +1318,10 @@ def add_cobd(gen, lustre, options): if not mdsdev_node.getElementsByTagName('obdtype'): gen.addElement(mdsdev_node, 'obdtype', 'cache') + if not master_uuid or not cache_uuid: + panic("add_cobd", "cannot find master or cache by names '" + + master_name + "' and '" + cache_name + "'") + node = findByName(lustre, node_name, "node") cobd = gen.cobd(name, uuid, master_uuid, cache_uuid) lustre.appendChild(cobd) @@ -1368,22 +1382,29 @@ def add_lov(gen, lustre, options): lovconfig_uuid = new_uuid(lovconfig_name) if mds_name: mds = findByName(lustre, mds_name, "mds") + if not mds: + panic("add_lov", "can't find MDS '" + mds_name + "'") mds.appendChild(gen.ref("lovconfig", lovconfig_uuid)) mds.appendChild(gen.ref("client", uuid)) if lmv_name: lmv = findByName(lustre, lmv_name, "lmv") + if not lmv: + panic("add_lov", "can't find LMV '" + lmv_name + "'") lmv.appendChild(gen.ref("lovconfig", lovconfig_uuid)) lmv.appendChild(gen.ref("client", uuid)) - if cache_lmv_name: lmv = findByName(lustre, cache_lmv_name, "lmv") + if not lmv: + panic("add_lov", "can't find LMV '" + cache_lmv_name + "'") lmv.appendChild(gen.ref("lovconfig", lovconfig_uuid)) lmv.appendChild(gen.ref("client", uuid)) if master_lmv_name: lmv = findByName(lustre, master_lmv_name, "lmv") + if not lmv: + panic("add_lov", "can't find LMV '" + master_lmv_name + "'") lmv.appendChild(gen.ref("lovconfig", lovconfig_uuid)) lmv.appendChild(gen.ref("client", uuid)) -- 1.8.3.1