From 42c6c0d5fa3081f09cde3371323a1cc256a021f7 Mon Sep 17 00:00:00 2001
From: shaver <shaver>
Date: Mon, 3 Feb 2003 18:25:50 +0000
Subject: [PATCH] Fix recovery underpinnings:  - Store the client's UUID (from
 last_rcvd) in exp_client_uuid, so    target_handle_connect can match it up. 
 - Don't obd_connect if target_handle_reconnect matched us up with an existing
    export.  - Don't invalidate everything so eagerly: only if we can't
 recover and it    wasn't a partition-reconnect.  - Clear the in-recovery flag
 before we send clients their delayed replies.  - Add "force" argument to lctl
 cleanup, and remove it from detach.  - Use new lmc API for recovery-small.sh
 (more test cleanup coming).

---
 lustre/tests/recovery-small.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index b57b169..26bb81f 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -53,10 +53,10 @@ make_config() {
     done
     lmc -m $CONFIG --add mds --node $MDSNODE --mds mds1 --dev $MDSDEV \
         --size $MDSSIZE || exit 5
-    lmc -m $CONFIG --add ost --node $OSTNODE --obd obd1 --dev $OSTDEV \
+    lmc -m $CONFIG --add ost --node $OSTNODE --ost ost1 --dev $OSTDEV \
         --size $OSTSIZE || exit 6
     lmc -m $CONFIG --add mtpt --node $CLIENT --path $MOUNTPT --mds mds1 \
-        --obd obd1 || exit 7
+        --ost ost1 || exit 7
 }
 
 start_mds() {
@@ -109,6 +109,7 @@ replay() {
     shutdown_mds -f
     start_mds
     wait
+    do_client "ls $MOUNPT" # trigger failover, if we haven't already
 }
 
 if [ ! -z "$ONLY" ]; then
-- 
1.8.3.1