Land b_bug1742 onto b1_4_smallfix (20040614_1231)

  1742 - allow clients to reconnect durign replay
  3570 - resend bulk reqs
  3515 - only evict clients above gap after recovery aborts
  3554 - fix cond_resched()

diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index 68d0ff9..9c05b27 100755 (executable)
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -12,6 +12,9 @@ init_test_env $@
 
 ALWAYS_EXCEPT="10"
 
+SETUP=${SETUP:-"setup"}
+CLEANUP=${CLEANUP:-"cleanup"}
+
 build_test_filter
 
 assert_env mds_HOST ost1_HOST ost2_HOST client_HOST LIVE_CLIENT 
@@ -128,6 +131,8 @@ gen_config() {
 }
 
 setup() {
+    gen_config
+
     rm -rf logs/*
     for i in `seq $NUMOST`; do
        wait_for ost$i
@@ -205,20 +210,17 @@ node_to_ost() {
 
 
 if [ "$ONLY" == "cleanup" ]; then
-    cleanup
+    $CLEANUP
     exit
 fi
 
-if [ -z "$NOSETUP" ]; then
-    gen_config
-    setup
-fi
-
 if [ ! -z "$EVAL" ]; then
     eval "$EVAL"
     exit $?
 fi
 
+$SETUP
+
 if [ "$ONLY" == "setup" ]; then
     exit 0
 fi
@@ -615,4 +617,4 @@ test_10() {
 run_test 10 "Running Availability for 6 hours..."
 
 equals_msg "Done, cleaning up"
-cleanup
+$CLEANUP