From b0d1b9c4e7f150f115e5c034be5c3633d1c3add6 Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 21 Mar 2006 16:53:12 +0000 Subject: [PATCH] Branch b1_4_mountconf b=9858 get service name from disk label --- lustre/tests/cfg/local.sh | 6 +++--- lustre/tests/llmount.sh | 2 +- lustre/tests/local.sh | 6 +++--- lustre/tests/recovery-small.sh | 10 ---------- lustre/tests/test-framework.sh | 33 ++++++++++++++++++++++----------- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh index 0d10302..f232d8b 100644 --- a/lustre/tests/cfg/local.sh +++ b/lustre/tests/cfg/local.sh @@ -21,9 +21,9 @@ OSTSIZE=${OSTSIZE:-200000} OSTDEV2=${OSTDEV2:-$ROOT/tmp/${FSNAME}-ost1} FSTYPE=${FSTYPE:-ext3} -MDS_MKFS_OPTS="--mgs --mdt --device-size=$MDSSIZE $MDSOPT" -OST_MKFS_OPTS="--ost --device-size=$OSTSIZE --mgsnid=`h2$NETTYPE $HOSTNAME` $OSTOPT" -OST2_MKFS_OPTS="--ost --device-size=$OSTSIZE --mgsnid=`h2$NETTYPE $HOSTNAME` $OSTOPT" +MDS_MKFS_OPTS="--mgs --mdt --index=0 --device-size=$MDSSIZE $MDSOPT" +OST_MKFS_OPTS="--ost --index=0 --device-size=$OSTSIZE --mgsnid=`h2$NETTYPE $HOSTNAME` $OSTOPT" +OST2_MKFS_OPTS="--ost --index=1 --device-size=$OSTSIZE --mgsnid=`h2$NETTYPE $HOSTNAME` $OSTOPT" MDS_MOUNT_OPTS="-o loop" OST_MOUNT_OPTS="-o loop" diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh index 8a47ea6..c7835f9 100755 --- a/lustre/tests/llmount.sh +++ b/lustre/tests/llmount.sh @@ -29,7 +29,7 @@ fi [ "$DEBUG" ] && debug_opt="--ptldebug=$DEBUG" [ "$PTLDEBUG" ] && debug_opt="--ptldebug=$PTLDEBUG" -echo FIXME use the utils/cluster_scripts/cluster_config.sh to parse config csv files. +echo llmount: FIXME use the utils/cluster_scripts/cluster_config.sh to parse config csv files. exit 1 diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh index 28748f2..fb19ac6 100755 --- a/lustre/tests/local.sh +++ b/lustre/tests/local.sh @@ -68,7 +68,7 @@ MGSNID=`h2$NETTYPE $HOSTNAME` MDS_MOUNT_OPTS="--mkfsoptions=\"$MDS_MOUNT_OPTS\"" [ "x$QUOTA_OPTS" != "x" ] && QUOTA_OPTS="--quota $QUOTA_OPTS" -[ ! -z "$mdsfailover_HOST" ] && MDS_FAIL_OPT="--failover=$mdsfailover_HOST" +[ ! -z "$mdsfailover_HOST" ] && MDS_FAIL_OPT="--failnode=$mdsfailover_HOST" MDS_OPTS="--mgs $MDS_FAIL_OPT --device-size=$MDSSIZE $MDS_MOUNT_OPTS $MDS_MKFS_OPTS" echo mkfs.lustre --mdt $MDS_OPTS --reformat $MDSDEV @@ -78,9 +78,9 @@ echo mkfs.lustre --mdt $MDS_OPTS --reformat $MDSDEV [ "x$OST_MKFS_OPTS" != "x" ] && OST_MOUNT_OPTS="--mkfsoptions=\"$OST_MOUNT_OPTS\"" -OST_OPTS="--mgsnid=`h2$NETTYPE $HOSTNAME` $OST_FAIL_OPT --device-size=$OSTSIZE $OST_MOUNT_OPTS $OST_MKFS_OPTS" +OST_OPTS="--mgsnode=`h2$NETTYPE $HOSTNAME` $OST_FAIL_OPT --device-size=$OSTSIZE $OST_MOUNT_OPTS $OST_MKFS_OPTS" echo mkfs.lustre --ost $OST_OPTS --reformat $OSTDEV -OST2_OPTS="--mgsnid=`h2$NETTYPE $HOSTNAME` $OST_FAIL_OPT --device-size=$OSTSIZE $OST_MOUNT_OPTS $OST_MKFS_OPTS" +OST2_OPTS="--mgsnode=`h2$NETTYPE $HOSTNAME` $OST_FAIL_OPT --device-size=$OSTSIZE $OST_MOUNT_OPTS $OST_MKFS_OPTS" echo mkfs.lustre --ost $OST2_OPTS --reformat $OSTDEV2 diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 0f1ceb7..d58578d 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -48,16 +48,6 @@ cleanup() { stop ost ${FORCE} --dump $TMP/recovery-small-`hostname`.log } -replay() { - do_mds "sync" - do_mds 'echo -e "device \$mds1\\nprobe\\nnotransno\\nreadonly" | lctl' - do_client "$1" & - shutdown_mds -f - start_mds - wait - do_client "df -h $MOUNT" # trigger failover, if we haven't already -} - if [ ! -z "$EVAL" ]; then eval "$EVAL" exit $? diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 741b13d..106b785 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -38,6 +38,7 @@ init_test_env() { export PATH=:$PATH:$LUSTRE/utils:$LUSTRE/tests export LCTL=${LCTL:-"$LUSTRE/utils/lctl"} + export MKFS=${MKFS:-"$LUSTRE/utils/mkfs.lustre"} export CHECKSTAT="${CHECKSTAT:-checkstat} " export FSYTPE=${FSTYPE:-"ext3"} @@ -84,9 +85,11 @@ start() { # $@ $XMLCONFIG RC=${PIPESTATUS[0]} if [ $RC -ne 0 ]; then - # maybe acceptor error, dump tcp port usage - netstat -tpn + echo Start of ${device} on ${facet} failed ${RC} fi + label=`do_facet ${facet} e2label ${device}` + eval export ${facet}_svc=${label} + echo Started ${label} return $RC } @@ -194,28 +197,35 @@ facet_failover() { start $* } +obd_name() { + local facet=$1 +} + replay_barrier() { local facet=$1 do_facet $facet sync df $MOUNT - do_facet $facet $LCTL --device %${facet}_svc readonly - do_facet $facet $LCTL --device %${facet}_svc notransno + local svc=${facet}_svc + do_facet $facet $LCTL --device %${!svc} readonly + do_facet $facet $LCTL --device %${!svc} notransno do_facet $facet $LCTL mark "$facet REPLAY BARRIER" - $LCTL mark "local REPLAY BARRIER" + $LCTL mark "local REPLAY BARRIER on ${!svc}" } replay_barrier_nodf() { local facet=$1 do_facet $facet sync - do_facet $facet $LCTL --device %${facet}_svc readonly - do_facet $facet $LCTL --device %${facet}_svc notransno + local svc=${facet}_svc + echo Replay barrier on ${!svc} + do_facet $facet $LCTL --device %${!svc} readonly + do_facet $facet $LCTL --device %${!svc} notransno do_facet $facet $LCTL mark "$facet REPLAY BARRIER" - $LCTL mark "local REPLAY BARRIER" + $LCTL mark "local REPLAY BARRIER on ${!svc}" } mds_evict_client() { UUID=`cat /proc/fs/lustre/mdc/*_MNT_*/uuid` - do_facet mds "echo $UUID > /proc/fs/lustre/mds/mds_svc/evict_client" + do_facet mds "echo $UUID > /proc/fs/lustre/mds/${mds_svc}/evict_client" } fail() { @@ -229,7 +239,8 @@ fail_abort() { stop $facet change_active $facet start $* - do_facet $facet lctl --device %${facet}_svc abort_recovery + local svc=${facet}_svc + do_facet $facet lctl --device %${!svc} abort_recovery df $MOUNT || echo "first df failed: $?" sleep 1 df $MOUNT || error "post-failover df: $?" @@ -369,7 +380,7 @@ add() { # failsafe umount -d -f /mnt/${facet} || true rm -f ${facet}active - mkfs.lustre $* + $MKFS $* } add_client() { -- 1.8.3.1