From 8369b235a364110239322834acfb4e11e75854e7 Mon Sep 17 00:00:00 2001
From: nathan <nathan>
Date: Thu, 8 Jun 2006 21:52:59 +0000
Subject: [PATCH] Branch b1_5 b=9858 more test fixes

---
 lustre/tests/recovery-small.sh    | 4 ++--
 lustre/tests/replay-dual.sh       | 6 +++---
 lustre/tests/replay-ost-single.sh | 2 +-
 lustre/tests/replay-single.sh     | 6 +++---
 lustre/tests/test-framework.sh    | 9 +++------
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index c336b9c..352c477 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -581,7 +581,7 @@ test_26() {      # bug 5921 - evict dead exports by pinger
 	    echo "skipping test 26 (local OST)" && return
 	[ "`lsmod | grep mds`" ] && \
 	    echo "skipping test 26 (local MDS)" && return
-	OST_FILE=$LPROC/obdfilter/ost_svc/num_exports
+	OST_FILE=$LPROC/obdfilter/${ost1_svc}/num_exports
         OST_EXP="`do_facet ost1 cat $OST_FILE`"
 	OST_NEXP1=`echo $OST_EXP | cut -d' ' -f2`
 	echo starting with $OST_NEXP1 OST exports
@@ -605,7 +605,7 @@ test_26b() {      # bug 10140 - evict dead exports by pinger
 	zconf_mount `hostname` $MOUNT2
 	MDS_FILE=$LPROC/mds/${mds_svc}/num_exports
         MDS_NEXP1="`do_facet mds cat $MDS_FILE | cut -d' ' -f2`"
-	OST_FILE=$LPROC/obdfilter/${ost_svc}/num_exports
+	OST_FILE=$LPROC/obdfilter/${ost1_svc}/num_exports
         OST_NEXP1="`do_facet ost1 cat $OST_FILE | cut -d' ' -f2`"
 	echo starting with $OST_NEXP1 OST and $MDS_NEXP1 MDS exports
 	zconf_umount `hostname` $MOUNT2 -f
diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index c2ce337..d91f2f9 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -395,12 +395,12 @@ test_17() {
     createmany -o $MOUNT2/$tfile-2- 1
 
     # Make sure the disconnect is lost
-    replay_barrier ost
+    replay_barrier ost1
     umount $MOUNT2
 
-    facet_failover ost
+    facet_failover ost1
     sleep $TIMEOUT
-    facet_failover ost
+    facet_failover ost1
     df $MOUNT || return 1
 
     unlinkmany $MOUNT1/$tfile- 25 || return 2
diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index ef76250..989ce2a 100755
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -168,7 +168,7 @@ test_7() {
     after_dd=`kbytesfree`
     log "before: $before after_dd: $after_dd"
     (( $before > $after_dd )) || return 1
-    replay_barrier ost
+    replay_barrier ost1
     rm -f $f
     fail ost1
     $CHECKSTAT -t file $f && return 2 || true
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index f254d28..35c4961 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -846,11 +846,11 @@ run_test 41 "read from a valid osc while other oscs are invalid"
 test_42() {
     blocks=`df -P $MOUNT | tail -n 1 | awk '{ print $2 }'`
     createmany -o $DIR/$tfile-%d 800
-    replay_barrier ost
+    replay_barrier ost1
     unlinkmany $DIR/$tfile-%d 0 400
     DEBUG42=`sysctl -n lnet.debug`
     sysctl -w lnet.debug=-1
-    facet_failover ost
+    facet_failover ost1
     
     # osc is evicted, fs is smaller (but only with failout OSTs (bug 7287)
     #blocks_after=`df -P $MOUNT | tail -n 1 | awk '{ print $2 }'`
@@ -984,7 +984,7 @@ test_48() {
 run_test 48 "MDS->OSC failure during precreate cleanup (2824)"
 
 test_50() {
-    local oscdev=`grep ${ost_svc}-osc- $LPROC/devices | awk '{print $1}'`
+    local oscdev=`grep ${ost1_svc}-osc- $LPROC/devices | awk '{print $1}'`
     [ "$oscdev" ] || return 1
     $LCTL --device $oscdev recover &&  $LCTL --device $oscdev recover
     # give the mds_lov_sync threads a chance to run
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index a2f0109..dc5c76f 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -30,7 +30,6 @@ usage() {
 init_test_env() {
     export LUSTRE=`absolute_path $LUSTRE`
     export TESTSUITE=`basename $0 .sh`
-    export XMLCONFIG=${XMLCONFIG:-${TESTSUITE}.xml}
     export LTESTDIR=${LTESTDIR:-$LUSTRE/../ltest}
 
     [ -d /r ] && export ROOT=${ROOT:-/r}
@@ -64,9 +63,6 @@ init_test_env() {
 
     shift $((OPTIND - 1))
     ONLY=${ONLY:-$*}
-
-    # save the name of the config file for the upcall
-    echo "XMLCONFIG=$LUSTRE/tests/$XMLCONFIG"  > $LUSTRE/tests/XMLCONFIG
 }
 
 load_module() {
@@ -103,7 +99,8 @@ load_modules() {
     load_module llite/lustre
     load_module mgc/mgc
     load_module mgs/mgs
-    $LCTL modules >> /tmp/ogdb-`hostname`
+    rm -f /tmp/ogdb-`hostname`
+    $LCTL modules > /tmp/ogdb-`hostname`
     # 'mount' doesn't look in $PATH, just sbin
     cp $LUSTRE/utils/mount.lustre /sbin/.
 }
@@ -334,7 +331,7 @@ mds_evict_client() {
 
 ost_evict_client() {
     UUID=`cat /proc/fs/lustre/osc/*_MNT_*/uuid | head -n 1`
-    do_facet ost1 "echo $UUID > /proc/fs/lustre/obdfilter/ost_svc/evict_client"
+    do_facet ost1 "echo $UUID > /proc/fs/lustre/obdfilter/${ost1_svc}/evict_client"
 }
 
 fail() {
-- 
1.8.3.1