X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_support.h;h=ce8316246e5947b818f0205809de2a46f3475c85;hb=dc52a88cde1e7cea093b25fc9a15509fe0ac527a;hp=e4aaaf847d57136946dd4c2f76fbab94bd2066ae;hpb=b724079edc5b66e1046b5760a6bad3045e9a9260;p=fs%2Flustre-release.git diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index e4aaaf8..ce83162 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -53,6 +53,7 @@ enum { extern unsigned int obd_debug_peer_on_timeout; extern unsigned int obd_dump_on_timeout; extern unsigned int obd_dump_on_eviction; +extern unsigned int obd_lbug_on_eviction; /* obd_timeout should only be used for recovery, not for networking / disk / timings affected by load (use Adaptive Timeouts) */ extern unsigned int obd_timeout; /* seconds */ @@ -179,7 +180,9 @@ extern char obd_jobid_var[]; #define OBD_FAIL_MDS_GET_ROOT_NET 0x11b #define OBD_FAIL_MDS_GET_ROOT_PACK 0x11c #define OBD_FAIL_MDS_STATFS_PACK 0x11d +#define OBD_FAIL_MDS_STATFS_SUM_PACK 0x11d #define OBD_FAIL_MDS_STATFS_NET 0x11e +#define OBD_FAIL_MDS_STATFS_SUM_NET 0x11e #define OBD_FAIL_MDS_GETATTR_NAME_NET 0x11f #define OBD_FAIL_MDS_PIN_NET 0x120 #define OBD_FAIL_MDS_UNPIN_NET 0x121 @@ -247,6 +250,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_MDS_TRACK_OVERFLOW 0x162 #define OBD_FAIL_MDS_LOV_CREATE_RACE 0x163 #define OBD_FAIL_MDS_HSM_CDT_DELAY 0x164 +#define OBD_FAIL_MDS_ORPHAN_DELETE 0x165 /* layout lock */ #define OBD_FAIL_MDS_NO_LL_GETATTR 0x170 @@ -275,6 +279,8 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OSD_NO_OI_ENTRY 0x198 #define OBD_FAIL_OSD_INDEX_CRASH 0x199 +#define OBD_FAIL_OSD_TXN_START 0x19a + #define OBD_FAIL_OFD_SET_OID 0x1e0 #define OBD_FAIL_OST 0x200 @@ -333,6 +339,9 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OST_SKIP_LV_CHECK 0x241 #define OBD_FAIL_OST_STATFS_DELAY 0x242 #define OBD_FAIL_OST_INTEGRITY_FAULT 0x243 +#define OBD_FAIL_OST_INTEGRITY_CMP 0x244 +#define OBD_FAIL_OST_DISCONNECT_DELAY 0x245 +#define OBD_FAIL_OST_DELAY_TRANS 0x246 #define OBD_FAIL_LDLM 0x300 #define OBD_FAIL_LDLM_NAMESPACE_NEW 0x301 @@ -431,6 +440,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_PTLRPC_LONG_BOTH_UNLINK 0x51c #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB3 0x520 #define OBD_FAIL_PTLRPC_BULK_ATTACH 0x521 +#define OBD_FAIL_PTLRPC_CONNECT_RACE 0x531 #define OBD_FAIL_OBD_PING_NET 0x600 /* OBD_FAIL_OBD_LOG_CANCEL_NET 0x601 obsolete since 1.5 */ @@ -472,7 +482,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801 #define OBD_FAIL_MDC_OLD_EXT_FLAGS 0x802 #define OBD_FAIL_MDC_GETATTR_ENQUEUE 0x803 -#define OBD_FAIL_MDC_RPCS_SEM 0x804 +#define OBD_FAIL_MDC_RPCS_SEM 0x804 /* deprecated */ #define OBD_FAIL_MDC_LIGHTWEIGHT 0x805 #define OBD_FAIL_MDC_CLOSE 0x806 #define OBD_FAIL_MDC_MERGE 0x807 @@ -531,6 +541,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_TIME_IN_CHLOG_USER 0x1314 #define CFS_FAIL_CHLOG_USER_REG_UNREG_RACE 0x1315 #define OBD_FAIL_FORCE_GC_THREAD 0x1316 +#define OBD_FAIL_LLOG_PROCESS_TIMEOUT 0x1317 #define OBD_FAIL_LLITE 0x1400 #define OBD_FAIL_LLITE_FAULT_TRUNC_RACE 0x1401 @@ -546,7 +557,6 @@ extern char obd_jobid_var[]; #define OBD_FAIL_LLITE_NEWNODE_PAUSE 0x140a #define OBD_FAIL_LLITE_SETDIRSTRIPE_PAUSE 0x140b #define OBD_FAIL_LLITE_CREATE_NODE_PAUSE 0x140c -#define OBD_FAIL_LLITE_PTASK_IO_FAIL 0x140d #define OBD_FAIL_LLITE_IMUTEX_SEC 0x140e #define OBD_FAIL_LLITE_IMUTEX_NOSEC 0x140f @@ -615,10 +625,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_INVALIDATE_UPDATE 0x1705 /* MIGRATE */ -#define OBD_FAIL_MIGRATE_NET_REP 0x1800 #define OBD_FAIL_MIGRATE_ENTRIES 0x1801 -#define OBD_FAIL_MIGRATE_LINKEA 0x1802 -#define OBD_FAIL_MIGRATE_DELAY 0x1803 /* LMV */ #define OBD_FAIL_UNKNOWN_LMV_STRIPE 0x1901 @@ -660,6 +667,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OSP_CHECK_INVALID_REC 0x2100 #define OBD_FAIL_OSP_CHECK_ENOMEM 0x2101 #define OBD_FAIL_OSP_FAKE_PRECREATE 0x2102 +#define OBD_FAIL_OSP_RPCS_SEM 0x2104 /* barrier */ #define OBD_FAIL_MGS_BARRIER_READ_NET 0x2200 @@ -670,6 +678,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OSD_FAIL_AT_TRUNCATE 0x2301 +/* LNet is allocated failure locations 0xe000 to 0xffff */ /* Assign references to moved code to reduce code changes */ #define OBD_FAIL_PRECHECK(id) CFS_FAIL_PRECHECK(id) #define OBD_FAIL_CHECK(id) CFS_FAIL_CHECK(id) @@ -751,11 +760,13 @@ static inline void obd_memory_sub(long size) #define __OBD_MALLOC_VERBOSE(ptr, cptab, cpt, size, flags) \ do { \ - (ptr) = (cptab) == NULL ? \ - kmalloc(size, (flags) | __GFP_ZERO) : \ - cfs_cpt_malloc(cptab, cpt, size, (flags) | __GFP_ZERO); \ - if (likely((ptr) != NULL)) \ - OBD_ALLOC_POST(ptr, size, "kmalloced"); \ + if (cptab) \ + ptr = cfs_cpt_malloc((cptab), (cpt), (size), \ + (flags) | __GFP_ZERO | __GFP_NOWARN); \ + if (!(cptab) || unlikely(!(ptr))) /* retry without CPT if failure */ \ + ptr = kmalloc(size, (flags) | __GFP_ZERO); \ + if (likely((ptr) != NULL)) \ + OBD_ALLOC_POST((ptr), (size), "kmalloced"); \ } while (0) #define OBD_ALLOC_GFP(ptr, size, gfp_mask) \