From 926da7de1135432ee0acfbf0a9d4b0087952ca9a Mon Sep 17 00:00:00 2001
From: rread <rread>
Date: Thu, 13 Nov 2003 01:27:36 +0000
Subject: [PATCH] - return replay-ost-single to runable state   now just need
 to pass

- commonize the zconf mount/umount
---
 lustre/tests/replay-ost-upcall.sh | 38 ++++++++++++++++++++++++++++++++++++++
 lustre/tests/replay-single.sh     | 16 ++--------------
 2 files changed, 40 insertions(+), 14 deletions(-)
 create mode 100755 lustre/tests/replay-ost-upcall.sh

diff --git a/lustre/tests/replay-ost-upcall.sh b/lustre/tests/replay-ost-upcall.sh
new file mode 100755
index 0000000..9f9efbf
--- /dev/null
+++ b/lustre/tests/replay-ost-upcall.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+
+TESTDIR=`dirname $0`
+LUSTRE=$TESTDIR/..
+
+exec >> $TESTDIR/recovery-`hostname`.log
+exec 2>&1
+
+set -xv
+
+failed_import() {
+#    $LUSTRE/utils/lctl --device %$3 recover ||
+#        logger -p kern.info recovery failed: $@
+
+    if [ -f $LUSTRE/tests/ostactive ] ; then
+	source $LUSTRE/tests/ostactive
+    else
+        ostactive=ost
+    fi
+
+    $LUSTRE/utils/lconf --verbose --recover --node client_facet  \
+      --select ost1=${ostactive}_facet\
+     --tgt_uuid $2 --client_uuid $3 --conn_uuid $4 $TESTDIR/replay-ost-single.xml
+
+}
+
+recovery_over() {
+    logger -p kern.info upcall: $@
+}
+
+
+case "$1" in
+FAILED_IMPORT) failed_import $@
+               ;;
+RECOVERY_OVER) recovery_over $@
+               ;;
+esac
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index a28caef..2627ab4 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -69,9 +69,7 @@ cleanup() {
     if [ $activemds != "mds" ]; then
         fail mds
     fi
-
-    umount  $MOUNT || :
-    rmmod llite || :
+    zconf_umount $MOUNT
     stop mds ${FORCE} $MDSLCONFARGS
     stop ost ${FORCE} --dump cleanup.log
 }
@@ -84,20 +82,10 @@ fi
 
 gen_config
 
-#start mds --write_conf --reformat $MDSLCONFARGS 
 start ost --reformat $OSTLCONFARGS 
 [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
 start mds $MDSLCONFARGS --reformat
-
-# 0-conf client
-[ -d $MOUNT ] || mkdir /mnt/lustre
-insmod $LUSTRE/llite/llite.o || :
-cp $LUSTRE/utils/llmount /sbin/mount.lustre
-[ -d /r ] && $LCTL modules > /r/tmp/ogdb-`hostname`
-mount -t lustre `facet_host mds`:/mds1/client_facet $MOUNT
-
-echo $TIMEOUT > /proc/sys/lustre/timeout
-echo $UPCALL > /proc/sys/lustre/upcall
+zconf_mount $MOUNT
 
 if [ "$ONLY" == "setup" ]; then
     exit 0
-- 
1.8.3.1