Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve handling recoverable errors
[fs/lustre-release.git]
/
lustre
/
ost
/
ost_handler.c
diff --git
a/lustre/ost/ost_handler.c
b/lustre/ost/ost_handler.c
index
9b1526a
..
cf051b4
100644
(file)
--- a/
lustre/ost/ost_handler.c
+++ b/
lustre/ost/ost_handler.c
@@
-679,8
+679,7
@@
static int ost_brw_read(struct ptlrpc_request *req, struct obd_trans_info *oti)
if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_READ_BULK))
GOTO(out, rc = -EIO);
if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_READ_BULK))
GOTO(out, rc = -EIO);
- OBD_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK | OBD_FAIL_ONCE,
- (obd_timeout + 1) / 4);
+ OBD_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK, (obd_timeout + 1) / 4);
/* Check if there is eviction in progress, and if so, wait for it to
* finish */
/* Check if there is eviction in progress, and if so, wait for it to
* finish */
@@
-936,10
+935,11
@@
static int ost_brw_write(struct ptlrpc_request *req, struct obd_trans_info *oti)
if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_WRITE_BULK))
GOTO(out, rc = -EIO);
if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_WRITE_BULK))
GOTO(out, rc = -EIO);
+ if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_WRITE_BULK2))
+ GOTO(out, rc = -EFAULT);
/* pause before transaction has been started */
/* pause before transaction has been started */
- OBD_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK | OBD_FAIL_ONCE,
- (obd_timeout + 1) / 4);
+ OBD_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK, (obd_timeout + 1) / 4);
/* Check if there is eviction in progress, and if so, wait for it to
* finish */
/* Check if there is eviction in progress, and if so, wait for it to
* finish */