openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: lustre: ptlrpc: allow blocking asts to be delayed 

ptlrpc_import_delay_req() refuses to delay blocking asts when import
is not in LUSTRE_IMP_FULL yet. That leads to client eviction assuming
that it failed to respond.

Allow delays for blocking asts being resent.

Signed-off-by: Vladimir Saveliev <vladimir.saveliev@seagate.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8351
Seagate-bug-id: MRP-3500
Reviewed-on: https://review.whamcloud.com/21065
Reviewed-by: Bobi Jam <bobijam@hotmail.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vladimir Saveliev 2017-01-28 19:05:10 -05:00 committed by Greg Kroah-Hartman
parent 7550387a6e
commit c6de2b37b7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/lustre/ptlrpc/client.c
View File

@ -1160,7 +1160,7 @@ static int ptlrpc_import_delay_req(struct obd_import *imp,
if (atomic_read(&imp->imp_inval_count) != 0) { if (atomic_read(&imp->imp_inval_count) != 0) {
DEBUG_REQ(D_ERROR, req, "invalidate in flight"); DEBUG_REQ(D_ERROR, req, "invalidate in flight");
*status = -EIO; *status = -EIO;
} else if (imp->imp_dlm_fake || req->rq_no_delay) { } else if (req->rq_no_delay) {
*status = -EWOULDBLOCK; *status = -EWOULDBLOCK;
} else if (req->rq_allow_replay && } else if (req->rq_allow_replay &&
(imp->imp_state == LUSTRE_IMP_REPLAY || (imp->imp_state == LUSTRE_IMP_REPLAY ||

1
drivers/staging/lustre/lustre/ptlrpc/recover.c
View File

@ -221,6 +221,7 @@ int ptlrpc_resend(struct obd_import *imp)
} }
spin_unlock(&imp->imp_lock); spin_unlock(&imp->imp_lock);
OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT, 2);
return 0; return 0;
} }