From e1db4cce23855b074ed54b5689a57e85305c0a88 Mon Sep 17 00:00:00 2001 From: huanghua Date: Tue, 23 Dec 2008 01:54:16 +0000 Subject: [PATCH] Branch HEAD b=17912 att=20801 i=grev i=adilger sync fail_loc with 1.8 --- lustre/include/obd_support.h | 35 +++++++++++++++++++++-------------- lustre/tests/replay-single.sh | 16 ++++++++-------- lustre/tests/sanity-quota.sh | 8 ++++---- lustre/tests/sanity.sh | 9 ++++----- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index c6ab400..64a6294 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -181,19 +181,23 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_MDS_SETXATTR_WRITE 0x134 #define OBD_FAIL_MDS_FS_SETUP 0x135 #define OBD_FAIL_MDS_RESEND 0x136 -#define OBD_FAIL_MDS_IS_SUBDIR_NET 0x137 -#define OBD_FAIL_MDS_IS_SUBDIR_PACK 0x138 -#define OBD_FAIL_MDS_SET_INFO_NET 0x139 -#define OBD_FAIL_MDS_WRITEPAGE_NET 0x13a -#define OBD_FAIL_MDS_WRITEPAGE_PACK 0x13b -#define OBD_FAIL_MDS_LLOG_CREATE_FAILED 0x13c -#define OBD_FAIL_MDS_OSC_PRECREATE 0x13d -#define OBD_FAIL_MDS_LOV_SYNC_RACE 0x13e -#define OBD_FAIL_MDS_CLOSE_NET_REP 0x13f -#define OBD_FAIL_MDS_LLOG_SYNC_TIMEOUT 0x140 -#define OBD_FAIL_MDS_RECOVERY_ACCEPTS_GAPS 0x141 -#define OBD_FAIL_MDS_BLOCK_QUOTA_REQ 0x142 -#define OBD_FAIL_MDS_DROP_QUOTA_REQ 0x143 +#define OBD_FAIL_MDS_LLOG_CREATE_FAILED 0x137 +#define OBD_FAIL_MDS_LOV_SYNC_RACE 0x138 +#define OBD_FAIL_MDS_OSC_PRECREATE 0x139 +#define OBD_FAIL_MDS_LLOG_SYNC_TIMEOUT 0x13a +#define OBD_FAIL_MDS_CLOSE_NET_REP 0x13b +#define OBD_FAIL_MDS_BLOCK_QUOTA_REQ 0x13c +#define OBD_FAIL_MDS_DROP_QUOTA_REQ 0x13d +#define OBD_FAIL_MDS_REMOVE_COMMON_EA 0x13e +#define OBD_FAIL_MDS_ALLOW_COMMON_EA_SETTING 0x13f + +/* CMD */ +#define OBD_FAIL_MDS_IS_SUBDIR_NET 0x180 +#define OBD_FAIL_MDS_IS_SUBDIR_PACK 0x181 +#define OBD_FAIL_MDS_SET_INFO_NET 0x182 +#define OBD_FAIL_MDS_WRITEPAGE_NET 0x183 +#define OBD_FAIL_MDS_WRITEPAGE_PACK 0x184 +#define OBD_FAIL_MDS_RECOVERY_ACCEPTS_GAPS 0x185 #define OBD_FAIL_OST 0x200 #define OBD_FAIL_OST_CONNECT_NET 0x201 @@ -262,7 +266,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_LDLM_CP_BL_RACE 0x318 /* LOCKLESS IO */ -#define OBD_FAIL_LDLM_SET_CONTENTION 0x315 +#define OBD_FAIL_LDLM_SET_CONTENTION 0x385 #define OBD_FAIL_OSC 0x400 #define OBD_FAIL_OSC_BRW_READ_BULK 0x401 @@ -291,6 +295,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB 0x508 #define OBD_FAIL_PTLRPC_PAUSE_REQ 0x50a #define OBD_FAIL_PTLRPC_PAUSE_REP 0x50c +#define OBD_FAIL_PTLRPC_IMP_DEACTIVE 0x50d #define OBD_FAIL_PTLRPC_DUMP_LOG 0x50e #define OBD_FAIL_PTLRPC_LONG_REPL_UNLINK 0x50f @@ -314,6 +319,8 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_TGT_DELAY_PRECREATE 0x705 #define OBD_FAIL_TGT_TOOMANY_THREADS 0x706 #define OBD_FAIL_TGT_REPLAY_DROP 0x707 +#define OBD_FAIL_TGT_FAKE_EXP 0x708 +#define OBD_FAIL_TGT_REPLAY_DELAY 0x709 #define OBD_FAIL_MDC_REVALIDATE_PAUSE 0x800 #define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801 diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index 141d25b..5a70822 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -1179,8 +1179,8 @@ test_53d() { # give multiop a chance to open sleep 1 - #define OBD_FAIL_MDS_CLOSE_NET_REP 0x13f - do_facet $SINGLEMDS "lctl set_param fail_loc=0x8000013f" + #define OBD_FAIL_MDS_CLOSE_NET_REP 0x13b + do_facet $SINGLEMDS "lctl set_param fail_loc=0x8000013b" kill -USR1 $close_pid cancel_lru_locks mdc # force the close do_facet $SINGLEMDS "lctl set_param fail_loc=0" @@ -1238,8 +1238,8 @@ test_53f() { open_pid=$! sleep 1 - #define OBD_FAIL_MDS_CLOSE_NET_REP 0x13f - do_facet $SINGLEMDS "lctl set_param fail_loc=0x8000013f" + #define OBD_FAIL_MDS_CLOSE_NET_REP 0x13b + do_facet $SINGLEMDS "lctl set_param fail_loc=0x8000013b" kill -USR1 $close_pid cancel_lru_locks mdc # force the close @@ -1300,8 +1300,8 @@ test_53h() { open_pid=$! sleep 1 - #define OBD_FAIL_MDS_CLOSE_NET_REP 0x13f - do_facet $SINGLEMDS "lctl set_param fail_loc=0x8000013f" + #define OBD_FAIL_MDS_CLOSE_NET_REP 0x13b + do_facet $SINGLEMDS "lctl set_param fail_loc=0x8000013b" kill -USR1 $close_pid cancel_lru_locks mdc # force the close sleep 1 @@ -1464,8 +1464,8 @@ run_test 61a "test race llog recovery vs llog cleanup" #test race mds llog sync vs llog cleanup test_61b() { -# OBD_FAIL_MDS_LLOG_SYNC_TIMEOUT 0x140 - do_facet $SINGLEMDS "lctl set_param fail_loc=0x80000140" +# OBD_FAIL_MDS_LLOG_SYNC_TIMEOUT 0x13a + do_facet $SINGLEMDS "lctl set_param fail_loc=0x8000013a" facet_failover $SINGLEMDS sleep 10 fail $SINGLEMDS diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 532d421..34409a8 100644 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -1330,8 +1330,8 @@ test_18() { $LFS setstripe $TESTFILE -i 0 -c 1 chown $TSTUSR.$TSTUSR $TESTFILE - #define OBD_FAIL_MDS_BLOCK_QUOTA_REQ 0x142 - lustre_fail mds 0x142 + #define OBD_FAIL_MDS_BLOCK_QUOTA_REQ 0x13c + lustre_fail mds 0x13c log " step1: write 100M block ..." $RUNAS dd if=/dev/zero of=$TESTFILE bs=$BLK_SZ count=$((1024 * 100)) & @@ -1384,8 +1384,8 @@ test_18a() { $LFS setstripe $TESTFILE -i 0 -c 1 chown $TSTUSR.$TSTUSR $TESTFILE - #define OBD_FAIL_MDS_DROP_QUOTA_REQ | OBD_FAIL_ONCE 0x80000143 - lustre_fail mds 0x80000143 + #define OBD_FAIL_MDS_DROP_QUOTA_REQ | OBD_FAIL_ONCE 0x8000013d + lustre_fail mds 0x8000013d log " step1: write 100M block ..." $RUNAS dd if=/dev/zero of=$TESTFILE bs=$BLK_SZ count=$((1024 * 100)) & diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 0b443f9..fc67228 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -1072,9 +1072,8 @@ test_27u() { # bug 4900 [ "$OSTCOUNT" -lt "2" ] && skip "too few OSTs" && return remote_mds_nodsh && skip "remote MDS with nodsh" && return - #define OBD_FAIL_MDS_OSC_PRECREATE 0x13d - - do_facet $SINGLEMDS lctl set_param fail_loc=0x13d +#define OBD_FAIL_MDS_OSC_PRECREATE 0x139 + do_facet $SINGLEMDS lctl set_param fail_loc=0x139 mkdir -p $DIR/d27u createmany -o $DIR/d27u/t- 1000 do_facet $SINGLEMDS lctl set_param fail_loc=0 @@ -2811,8 +2810,8 @@ run_test 60b "limit repeated messages from CERROR/CWARN ========" test_60c() { echo "create 5000 files" createmany -o $DIR/f60c- 5000 -#define OBD_FAIL_MDS_LLOG_CREATE_FAILED 0x13c - lctl set_param fail_loc=0x8000013c +#define OBD_FAIL_MDS_LLOG_CREATE_FAILED 0x137 + lctl set_param fail_loc=0x80000137 unlinkmany $DIR/f60c- 5000 lctl set_param fail_loc=0 } -- 1.8.3.1