Commit c6de2b37 authored Jan 28, 2017 by Vladimir Saveliev Committed by Greg Kroah-Hartman Feb 03, 2017

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>

parent 7550387a

drivers/staging/lustre/lustre/ptlrpc/client.c

+1 −1

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

drivers/staging/lustre/lustre/ptlrpc/recover.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -221,6 +221,7 @@ int ptlrpc_resend(struct obd_import *imp)
		}
		spin_unlock(&imp->imp_lock);

		OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT, 2);
		return 0;
		}