- remove use of "lctl device_list" from lconf, now using

    /proc/fs/lustre/devices

diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c
index c52ad4b..015b2ca 100644 (file)
--- a/lustre/osc/osc_create.c
+++ b/lustre/osc/osc_create.c
@@ -263,8 +263,8 @@ void oscc_init(struct obd_export *exp)
         spin_lock_init(&oed->oed_oscc.oscc_lock);
         oed->oed_oscc.oscc_exp = exp;
         oed->oed_oscc.oscc_kick_barrier = 100;
-        oed->oed_oscc.oscc_grow_count = 2000;
-        oed->oed_oscc.oscc_initial_create_count = 2000;
+        oed->oed_oscc.oscc_grow_count = 20;
+        oed->oed_oscc.oscc_initial_create_count = 20;
 
         oed->oed_oscc.oscc_next_id = 2;
         oed->oed_oscc.oscc_last_id = 1;

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index c74c1b8..9217cc2 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -2,27 +2,20 @@
 
 set -e
 
-# Skip these tests
-# 3 - bug 1852
-ALWAYS_EXCEPT="3"
-
-LCONF=${LCONF:-"../utils/lconf"}
-LMC=${LMC:-"../utils/lmc"}
-LCTL=${LCTL:-"../utils/lctl"}
 LUSTRE=${LUSTRE:-`dirname $0`/..}
-LTESTDIR=${LTESTDIR:-$LUSTRE/../ltest}
-PATH=$LUSTRE/utils:$LUSTRE/tests:$PATH
-
-RLUSTRE=${RLUSTRE:-$LUSTRE}
-RPWD=${RPWD:-$PWD}
-
-XMLCONFIG="`basename $0 .sh`.xml"
-
 . $LUSTRE/tests/test-framework.sh
 
-CHECKSTAT="${CHECKSTAT:-checkstat} -v"
+init_test_env
 
 # XXX I wish all this stuff was in some default-config.sh somewhere
+mds_HOST=${mds_HOST:-`hostname`}
+ost_HOST=${ost_HOST:-`hostname`}
+ostfailover_HOST=${ostfailover_HOST:-`hostname`}
+client_HOST=${client_HOST:-`hostname`}
+
+NETTYPE=${NETTYPE:-tcp}
+
+PDSH=${PDSH:-no_dsh}
 MOUNT=${MOUNT:-/mnt/lustre}
 DIR=${DIR:-$MOUNT}
 MDSDEV=${MDSDEV:-/tmp/mds-`hostname`}

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 176541b..6578fc9 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -20,12 +20,17 @@ init_test_env() {
     export LTESTDIR=${LTESTDIR:-$LUSTRE/../ltest}
 
     [ -d /r ] && export ROOT=/r
+
+    export PATH=:$PATH:$LUSTRE/utils:$LUSTRE/tests
+    export LCONF=${LCONF:-"lconf"}
+    export LMC=${LMC:-"lmc"}
+    export LCTL=${LCTL:-"lctl"}
+    export CHECKSTAT="${CHECKSTAT:-checkstat} -v"
+
+    # Paths on remote nodes, if different 
     export RLUSTRE=${RLUSTRE:-$LUSTRE}
     export RPWD=${RPWD:-$PWD}
-    export PATH=$PATH:$RLUSTRE/utils:$RLUSTRE/tests
-    export PATH=$RLUSTRE/utils:$RLUSTRE/tests:$PATH
-    
-    export CHECKSTAT="${CHECKSTAT:-checkstat} -v"
+
 }
 
 start() {
@@ -65,6 +70,16 @@ fail() {
     df $MOUNT || error "post-failover df: $?"
 }
 
+fail_abort() {
+    local facet=$1
+    stop $facet --force --failover --nomod
+    change_active $facet
+    start $facet
+    do_facet $facet lctl --device %${facet}1 abort_recovery
+    df $MOUNT || echo "first df failed: $?"
+    df $MOUNT || error "post-failover df: $?"
+}
+
 do_lmc() {
     $LMC -m ${XMLCONFIG} $@
 }
@@ -132,7 +147,7 @@ do_facet() {
     shift
     active=`facet_active $facet`
     HOST=`facet_host $active`
-    $PDSH $HOST "(PATH=\$PATH:$LUSTRE/utils:$LUSTRE/tests; cd $PWD; sh -c \"$@\")"
+    $PDSH $HOST "(PATH=\$PATH:$RLUSTRE/utils:$RLUSTRE/tests; cd $RPWD; sh -c \"$@\")"
 }
 
 add_facet() {