From 6c211e71be98732f8aea0df7a57c872fec2fd3c2 Mon Sep 17 00:00:00 2001
From: yury <yury>
Date: Mon, 25 Aug 2008 10:45:49 +0000
Subject: [PATCH] b=11190 r=tappro,shadow
- fixes some recover-small tests
---
lustre/ldlm/ldlm_lockd.c | 3 +--
lustre/mdt/mdt_handler.c | 25 +++++++++++++++++++++++--
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 9b6ecba462..88afb3f7ca 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -1115,12 +1115,11 @@ existing_lock:
EXIT;
out:
- req->rq_status = err;
+ req->rq_status = rc ?: err; /* return either error - bug 11190 */
if (!req->rq_packed_final) {
err = lustre_pack_reply(req, 1, NULL, NULL);
if (rc == 0)
rc = err;
- req->rq_status = rc;
}
/* The LOCK_CHANGED code in ldlm_lock_enqueue depends on this
diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 57313c99d2..a3e44b1115 100644
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -2851,6 +2851,9 @@ out_shrink:
return rc;
}
+#define IS_CLIENT_DISCONNECT_ERROR(error) \
+ (error == -ENOTCONN || error == -ENODEV)
+
static int mdt_intent_reint(enum mdt_it_code opcode,
struct mdt_thread_info *info,
struct ldlm_lock **lockp,
@@ -2903,8 +2906,26 @@ static int mdt_intent_reint(enum mdt_it_code opcode,
rep->lock_policy_res2 = clear_serious(rc);
lhc->mlh_reg_lh.cookie = 0ull;
- rc = ELDLM_LOCK_ABORTED;
- RETURN(rc);
+ if (IS_CLIENT_DISCONNECT_ERROR(rc)){
+ /*
+ * If it is the disconnect error (ENODEV & ENOCONN),
+ * the error will be returned by rq_stats, and client
+ * ptlrpc layer will detect this, then disconnect,
+ * reconnect the import immediately, instead of impacting
+ * the following the rpc.
+ */
+ RETURN(rc);
+ } else {
+ /*
+ * For other cases, the error will be returned by intent.
+ * and client will retrieve the result from intent.
+ */
+ /*
+ * FIXME: when open lock is finished, that should be
+ * checked here.
+ */
+ RETURN(ELDLM_LOCK_ABORTED);
+ }
}
static int mdt_intent_code(long itcode)
--
GitLab