diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a3921e47fb6400f7b352f90b2703316911e2398e..dc6bed354f3355a2fd6d827a31dd470a154f9522 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -18,6 +18,13 @@ tbd Sun Microsystems, Inc.
* RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
removed cwd "./" (refer to Bugzilla 14399).
+Severity : normal
+Bugzilla : 15069
+Description: don't put request into delay list while invalidate in flight.
+Details : ptlrpc_delay_request sometimes put in delay list while invalidate
+ import in flight. this produce timeout for invalidate and sometimes
+ can cause stale data.
+
Severity : enhancement
Bugzilla : 15416
Description: Update kernel to SLES9 2.6.5-7.311.
diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index d0341ae6343944443ce2b7e5fd1d23b7b0a68a76..e1ab586eb1c925e9fe80138b949207bf631e2c2d 100644
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -23,7 +23,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-
+
#ifndef EXPORT_SYMTAB
# define EXPORT_SYMTAB
#endif
@@ -868,7 +868,7 @@ int mgc_set_info_async(struct obd_export *exp, obd_count keylen,
}
RETURN(rc);
-}
+}
static int mgc_import_event(struct obd_device *obd,
struct obd_import *imp,
@@ -882,7 +882,6 @@ static int mgc_import_event(struct obd_device *obd,
switch (event) {
case IMP_EVENT_DISCON:
/* MGC imports should not wait for recovery */
- ptlrpc_invalidate_import(imp);
break;
case IMP_EVENT_INACTIVE:
break;
diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index a7e7ff067fce893552c197b0da28d9fb9f7f2ff5..b7b22eca7db3b98047bbcad1b4a642a1daf49bf8 100644
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -702,13 +702,17 @@ static int ptlrpc_import_delay_req(struct obd_import *imp,
} else if (req->rq_send_state == LUSTRE_IMP_CONNECTING &&
imp->imp_state == LUSTRE_IMP_CONNECTING) {
/* allow CONNECT even if import is invalid */ ;
- } else if (imp->imp_invalid && (!imp->imp_recon_bk ||
- imp->imp_obd->obd_no_recov)) {
+ if (atomic_read(&imp->imp_inval_count) != 0) {
+ DEBUG_REQ(D_ERROR, req, "invalidate in flight");
+ *status = -EIO;
+ }
+ } else if ((imp->imp_invalid && (!imp->imp_recon_bk)) ||
+ imp->imp_obd->obd_no_recov) {
/* If the import has been invalidated (such as by an OST
- * failure), and if the import(MGC) tried all of its connection
- * list (Bug 13464), the request must fail with -ESHUTDOWN.
+ * failure), and if the import(MGC) tried all of its connection
+ * list (Bug 13464), the request must fail with -ESHUTDOWN.
* This indicates the requests should be discarded; an -EIO
- * may result in a resend of the request. */
+ * may result in a resend of the request. */
if (!imp->imp_deactive)
DEBUG_REQ(D_ERROR, req, "IMP_INVALID");
*status = -ESHUTDOWN; /* bz 12940 */
@@ -716,12 +720,15 @@ static int ptlrpc_import_delay_req(struct obd_import *imp,
DEBUG_REQ(D_ERROR, req, "req wrong generation:");
*status = -EIO;
} else if (req->rq_send_state != imp->imp_state) {
- if (imp->imp_obd->obd_no_recov)
- *status = -ESHUTDOWN;
- else if (imp->imp_dlm_fake || req->rq_no_delay)
+ /* invalidate in progress - any requests should be drop */
+ 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) {
*status = -EWOULDBLOCK;
- else
+ } else {
delay = 1;
+ }
}
RETURN(delay);
@@ -1781,8 +1788,8 @@ int ptlrpc_queue_wait(struct ptlrpc_request *req)
req->rq_phase = RQ_PHASE_RPC;
spin_lock(&imp->imp_lock);
-restart:
req->rq_import_generation = imp->imp_generation;
+restart:
if (ptlrpc_import_delay_req(imp, req, &rc)) {
list_del(&req->rq_list);
diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index 618b11c41a2ad0a1e0901aeb8be720cc60fdc762..59878f0d8f83a9bf90321302546044f06aff09d3 100644
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -66,8 +66,6 @@ void request_out_callback(lnet_event_t *ev)
ptlrpc_wake_client_req(req);
}
- /* these balance the references in ptl_send_rpc() */
- atomic_dec(&req->rq_import->imp_inflight);
ptlrpc_req_finished(req);
EXIT;
diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 2d0cfa8470b03d1bf2b274f1226d567d237d610f..fc2c87b8e02e2d3ffdb27ede5c4d4aca33f0de6c 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -227,6 +227,7 @@ void ptlrpc_invalidate_import(struct obd_import *imp)
DEBUG_REQ(D_ERROR, req, "still on delayed list");
}
spin_unlock(&imp->imp_lock);
+ LASSERT(atomic_read(&imp->imp_inflight) == 0);
}
obd_import_event(imp->imp_obd, imp, IMP_EVENT_INVALIDATE);
diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index e9822b11c7f2259587181273cd70b8802ed5df37..d8960d22c65a26cc7c0ca40f5b6abd1c914548ae 100644
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -538,9 +538,8 @@ int ptl_send_rpc(struct ptlrpc_request *request, int noreply)
request->rq_reply_portal);
}
- /* add references on request and import for request_out_callback */
+ /* add references on request for request_out_callback */
ptlrpc_request_addref(request);
- atomic_inc(&request->rq_import->imp_inflight);
if (obd->obd_svc_stats != NULL)
lprocfs_counter_add(obd->obd_svc_stats, PTLRPC_REQACTIVE_CNTR,
request->rq_import->imp_inflight.counter);
@@ -569,10 +568,7 @@ int ptl_send_rpc(struct ptlrpc_request *request, int noreply)
RETURN(rc);
}
- /* drop request_out_callback refs, we couldn't start the send */
- atomic_dec(&request->rq_import->imp_inflight);
ptlrpc_req_finished(request);
-
if (noreply)
RETURN(rc);