From fb1b751f8c1c578f642d18e554eefcd832b50495 Mon Sep 17 00:00:00 2001 From: rread Date: Sun, 8 Feb 2004 22:45:24 +0000 Subject: [PATCH] - missed some calls to zconf_mount/umount in the test scripts when I updated insanity --- lustre/tests/conf-sanity.sh | 2 +- lustre/tests/recovery-small.sh | 4 ++-- lustre/tests/replay-dual.sh | 4 ++-- lustre/tests/replay-ost-single.sh | 4 ++-- lustre/tests/replay-single.sh | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 0f58491..6d3b313 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -77,7 +77,7 @@ mount_client() { umount_client() { local MOUNTPATH=$1 echo "umount lustre on ${MOUNTPATH}....." - zconf_umount $MOUNTPATH $CMDVERBOSE || return 97 + zconf_umount `hostname` $MOUNTPATH $CMDVERBOSE || return 97 } manual_umount_client(){ diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 18a93ea..8ae8c13 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -35,11 +35,11 @@ setup() { start ost2 --reformat $OSTLCONFARGS [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE start mds $MDSLCONFARGS --reformat - zconf_mount $MOUNT + zconf_mount `hostname` $MOUNT } cleanup() { - zconf_umount $MOUNT + zconf_umount `hostname` $MOUNT stop mds ${FORCE} $MDSLCONFARGS stop ost2 ${FORCE} --dump cleanup.log stop ost ${FORCE} --dump cleanup.log diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh index 9da6729..f6395a4 100755 --- a/lustre/tests/replay-dual.sh +++ b/lustre/tests/replay-dual.sh @@ -62,8 +62,8 @@ fi start ost2 --reformat $OSTLCONFARGS [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE start mds $MDSLCONFARGS --reformat -zconf_mount $MOUNT -zconf_mount $MOUNT2 +zconf_mount `hostname` $MOUNT +zconf_mount `hostname` $MOUNT2 echo $TIMEOUT > /proc/sys/lustre/timeout echo $UPCALL > /proc/sys/lustre/upcall diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh index d31b348..1aabb7d 100755 --- a/lustre/tests/replay-ost-single.sh +++ b/lustre/tests/replay-ost-single.sh @@ -34,7 +34,7 @@ cleanup() { if [ $activeost != "ost" ]; then fail ost fi - zconf_umount $MOUNT + zconf_umount `hostname` $MOUNT stop mds ${FORCE} $MDSLCONFARGS stop ost ${FORCE} --dump cleanup.log } @@ -55,7 +55,7 @@ start ost --reformat $OSTLCONFARGS [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE start mds --reformat $MDSLCONFARGS -zconf_mount $MOUNT +zconf_mount `hostname` $MOUNT mkdir -p $DIR diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index 8fdcb68..b516587 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -40,7 +40,7 @@ cleanup() { if [ $activemds != "mds" ]; then fail mds fi - zconf_umount $MOUNT + zconf_umount `hostname` $MOUNT stop mds ${FORCE} $MDSLCONFARGS stop ost2 ${FORCE} --dump cleanup.log stop ost ${FORCE} --dump cleanup.log @@ -62,7 +62,7 @@ setup() { start ost2 --reformat $OSTLCONFARGS [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE start mds $MDSLCONFARGS --reformat - zconf_mount $MOUNT + zconf_mount `hostname` $MOUNT } $SETUP -- 1.8.3.1