Branch b1_8

b=17912

att=20802
i=grev
i=grev

sync fail_loc from HEAD.

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 0417fc1..5b68b0a 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -242,6 +242,9 @@ extern unsigned int obd_alloc_fail_rate;
 #define OBD_FAIL_LDLM_INTR_CP_AST        0x317
 #define OBD_FAIL_LDLM_CP_BL_RACE         0x318
 
+/* LOCKLESS IO */
+#define OBD_FAIL_LDLM_SET_CONTENTION     0x385
+
 #define OBD_FAIL_OSC                     0x400
 #define OBD_FAIL_OSC_BRW_READ_BULK       0x401
 #define OBD_FAIL_OSC_BRW_WRITE_BULK      0x402
@@ -256,6 +259,7 @@ extern unsigned int obd_alloc_fail_rate;
 #define OBD_FAIL_OSC_CONNECT_CKSUM       0x40b
 #define OBD_FAIL_OSC_CKSUM_ADLER_ONLY    0x40c
 #define OBD_FAIL_OSC_DIO_PAUSE           0x40d
+#define OBD_FAIL_OSC_OBJECT_CONTENTION   0x40e
 
 #define OBD_FAIL_PTLRPC                  0x500
 #define OBD_FAIL_PTLRPC_ACK              0x501

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 33ac920..f9a5f65 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -1068,11 +1068,13 @@ test_53c() {
     multiop $DIR/${tdir}-1/f O_c &
     close_pid=$!
 
+#define OBD_FAIL_MDS_REINT_NET           0x107
     do_facet mds "lctl set_param fail_loc=0x80000107"
     mcreate $DIR/${tdir}-2/f &
     open_pid=$!
     sleep 1
 
+#define OBD_FAIL_MDS_CLOSE_NET           0x115
     do_facet mds "lctl set_param fail_loc=0x80000115"
     kill -USR1 $close_pid
     cancel_lru_locks mdc  # force the close
@@ -1099,7 +1101,7 @@ test_53d() {
     # give multiop a chance to open
     sleep 1
 
-    # define OBD_FAIL_MDS_CLOSE_NET_REP 0X138    
+#define OBD_FAIL_MDS_CLOSE_NET_REP       0x13b
     do_facet mds "lctl set_param fail_loc=0x8000013b"
     kill -USR1 $close_pid
     cancel_lru_locks mdc  # force the close
@@ -1153,11 +1155,13 @@ test_53f() {
         multiop $DIR/${tdir}-1/f O_c &
         close_pid=$!
 
+#define OBD_FAIL_MDS_REINT_NET_REP       0x119
         do_facet mds "lctl set_param fail_loc=0x80000119"
         mcreate $DIR/${tdir}-2/f &
         open_pid=$!
         sleep 1
 
+#define OBD_FAIL_MDS_CLOSE_NET_REP       0x13b
         do_facet mds "lctl set_param fail_loc=0x8000013b"
         kill -USR1 $close_pid
         cancel_lru_locks mdc
@@ -1182,11 +1186,13 @@ test_53g() {
         multiop $DIR/${tdir}-1/f O_c &
         close_pid=$!
 
+#define OBD_FAIL_MDS_REINT_NET_REP       0x119
         do_facet mds "lctl set_param fail_loc=0x80000119"
         mcreate $DIR/${tdir}-2/f &
         open_pid=$!
         sleep 1
 
+#define OBD_FAIL_MDS_CLOSE_NET           0x115
         do_facet mds "lctl set_param fail_loc=0x80000115"
         kill -USR1 $close_pid
         cancel_lru_locks mdc # force the close
@@ -1211,11 +1217,13 @@ test_53h() {
     multiop $DIR/${tdir}-1/f O_c &
     close_pid=$!
 
+#define OBD_FAIL_MDS_REINT_NET           0x107
     do_facet mds "lctl set_param fail_loc=0x80000107"
     mcreate $DIR/${tdir}-2/f &
     open_pid=$!
     sleep 1
 
+#define OBD_FAIL_MDS_CLOSE_NET_REP       0x13b
     do_facet mds "lctl set_param fail_loc=0x8000013b"
     kill -USR1 $close_pid
     cancel_lru_locks mdc  # force the close