merge from HEAD to b_io.

diff --git a/lustre/include/linux/lustre_ha.h b/lustre/include/linux/lustre_ha.h
index 1e6596b..bfac4c3 100644 (file)
--- a/lustre/include/linux/lustre_ha.h
+++ b/lustre/include/linux/lustre_ha.h
@@ -29,6 +29,7 @@ struct ptlrpc_connection;
 #define PTLRPC_RECOVD_PHASE_PREPARE  1
 #define PTLRPC_RECOVD_PHASE_RECOVER  2
 #define PTLRPC_RECOVD_PHASE_FAILURE  3
+#define PTLRPC_RECOVD_PHASE_NOTCONN  4
 
 typedef int (*ptlrpc_recovery_cb_t)(struct recovd_data *, int);
 

diff --git a/lustre/tests/llecho.sh b/lustre/tests/llecho.sh
index a47c088..e99289c 100644 (file)
--- a/lustre/tests/llecho.sh
+++ b/lustre/tests/llecho.sh
@@ -5,7 +5,7 @@ LCONF=${LCONF:-../utils/lconf}
 LMC=${LMC:-../utils/lmc}
 
 SERVER=localhost
-CLIENT=localhost
+CLIENT=cfs4
 
 # FIXME: make LMC not require MDS for obdecho LOV
 MDSDEV=$TMP/mds1
@@ -23,24 +23,30 @@ while [ "$1" ]; do
         shift
 done
 
+rm -f $config
 # create nodes
-$LMC -o $config --node $SERVER --net $SERVER tcp || exit 1
+$LMC -o $config --add node --node $SERVER  || exit 1
+$LMC -m $config --add net --node $SERVER --nid $SERVER --nettype tcp || exit 2
 
 if (($LOV)); then
-    $LMC -m $config --node $SERVER --mds mds1 $MDSDEV $MDSSIZE || exit 10
-    $LMC -m $config --lov lov1 mds1 $STRIPE_BYTES $STRIPES_PER_OBJ 0 || exit 11
-    $LMC -m $config --node $SERVER --lov lov1 --obdtype=obdecho --ost || exit 12
-    $LMC -m $config --node $SERVER --lov lov1 --obdtype=obdecho --ost || exit 13
-
-    $LMC -m $config --node $CLIENT --echo_client lov1 || exit 3
+    $LMC -m $config --add mds --node $SERVER --mds mds1 --dev $MDSDEV --size $MDSSIZE || exit 10
+    $LMC -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 11
+    $LMC -m $config --add ost --node $SERVER --lov lov1 --obdtype=obdecho || exit 12
+    $LMC -m $config --add ost --node $SERVER --lov lov1 --obdtype=obdecho || exit 13
+    OBD_NAME=lov1
 else
-    $LMC -m $config --node $SERVER --obdtype=obdecho --ost || exit 2
-    # force the osc to be configured (this is normally done when it is mounted)
-    $LMC -m $config --node $CLIENT --osc OSC_$SERVER || exit 3
-    $LMC -m $config --node $CLIENT --echo_client OSC_${SERVER} || exit 3
+    $LMC -m $config --add ost --obd obd1 --node $SERVER --obdtype=obdecho || exit 2
+    OBD_NAME=obd1
+fi
+
+if [ "$SERVER" != "$CLIENT" ]; then
+   $LMC -m $config --add node --node $CLIENT  || exit 1
+   $LMC -m $config --add net --node $CLIENT --nid $CLIENT --nettype tcp || exit 2
 fi
 
-$LCONF --gdb $OPTS $config || exit 4
+$LMC -m $config --add echo_client --node $CLIENT --obd ${OBD_NAME} || exit 3
+
+$LCONF --reformat --gdb $OPTS $config || exit 4
 
 cat <<EOF