diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 98bacf1d69365969cf3a00bb1653c2f8c73b78c5..cc370c968c95639444dbd047c30d2bc1946a7d5d 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -12,6 +12,14 @@
* Recommended e2fsprogs version: 1.40.2-cfs4
* Note that reiserfs quotas are disabled on SLES 10 in this kernel.
+Severity : major
+Frequency : occasional
+Bugzilla : 13917
+Description: MDS hang or stay in waiting lock
+Details : If client receive lock with CBPENDING flag ldlm need send lock
+ cancel as separate rpc, to avoid situation when cancel request
+ can't processed due all i/o threads stay in wait lock.
+
Severity : normal
Bugzilla : 13969
Description: Update to RHEL5 kernel 2.6.18-8.1.15.el5.
@@ -470,7 +478,6 @@ Details : Update to the latest RHEL 4 kernel to fix the vulnerability
described in CVE-2007-4573. This problem could allow untrusted
local users to gain root access.
-
Severity : normal
Frequency : when using O_DIRECT and quotas
Bugzilla : 13930
diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index c1d2b6de10bea56d90564bea23822342cdba409d..3e2bce29c15f73f30d0a39b031b6ff43d813c160 100644
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -426,7 +426,7 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req,
* bug 7311). */
(LIBLUSTRE_CLIENT && type == LDLM_EXTENT)) {
lock_res_and_lock(lock);
- lock->l_flags |= LDLM_FL_CBPENDING;
+ lock->l_flags |= LDLM_FL_CBPENDING | LDLM_FL_BL_AST;
unlock_res_and_lock(lock);
LDLM_DEBUG(lock, "enqueue reply includes blocking AST");
}
@@ -508,7 +508,7 @@ struct ptlrpc_request *ldlm_prep_enqueue_req(struct obd_export *exp,
struct ptlrpc_request *req;
CFS_LIST_HEAD(head);
ENTRY;
-
+
if (cancels == NULL)
cancels = &head;
if (exp_connect_cancelset(exp)) {
@@ -516,7 +516,7 @@ struct ptlrpc_request *ldlm_prep_enqueue_req(struct obd_export *exp,
int avail = ldlm_req_handles_avail(exp, size, bufcount,
LDLM_ENQUEUE_CANCEL_OFF);
LASSERT(avail >= count);
-
+
/* Cancel lru locks here _only_ if the server supports
* EARLY_CANCEL. Otherwise we have to send extra CANCEL
* rpc right on enqueue, what will make it slower, vs.
@@ -1004,7 +1004,7 @@ int ldlm_cli_cancel(struct lustre_handle *lockh)
LDLM_DEBUG_NOLOCK("lock is already being destroyed\n");
RETURN(0);
}
-
+
rc = ldlm_cli_cancel_local(lock);
list_add(&lock->l_bl_ast, &cancels);
@@ -1024,6 +1024,63 @@ int ldlm_cli_cancel(struct lustre_handle *lockh)
RETURN(rc < 0 ? rc : 0);
}
+/* XXX until we will have compound requests and can cut cancels from generic rpc
+ * we need send cancels with LDLM_FL_BL_AST flag as separate rpc */
+static int ldlm_cancel_list(struct list_head *cancels, int count)
+{
+ CFS_LIST_HEAD(head);
+ struct ldlm_lock *lock, *next;
+ int left = 0, bl_ast = 0, rc;
+
+ left = count;
+ list_for_each_entry_safe(lock, next, cancels, l_bl_ast) {
+ if (left-- == 0)
+ break;
+
+ rc = ldlm_cli_cancel_local(lock);
+ if (rc == LDLM_FL_BL_AST) {
+ LDLM_DEBUG(lock, "Cancel lock separately");
+ list_del_init(&lock->l_bl_ast);
+ list_add(&lock->l_bl_ast, &head);
+ bl_ast ++;
+ continue;
+ }
+ if (rc == LDLM_FL_LOCAL_ONLY) {
+ /* CANCEL RPC should not be sent to server. */
+ list_del_init(&lock->l_bl_ast);
+ LDLM_LOCK_PUT(lock);
+ count--;
+ }
+
+ }
+ if(bl_ast > 0) {
+ count -= bl_ast;
+ ldlm_cli_cancel_list(&head, bl_ast, NULL, 0, 0);
+ }
+
+ RETURN(count);
+}
+
+
+/* cancel lock list without sending rpc to server*/
+static int ldlm_cancel_list_local(struct list_head *cancels, int count)
+{
+ struct ldlm_lock *lock, *next;
+ int left = 0;
+
+ left = count;
+ list_for_each_entry_safe(lock, next, cancels, l_bl_ast) {
+ if (left-- == 0)
+ break;
+ ldlm_lock_cancel(lock);
+ /* CANCEL RPC should not be sent to server. */
+ list_del_init(&lock->l_bl_ast);
+ LDLM_LOCK_PUT(lock);
+ count--;
+ }
+ RETURN(count);
+}
+
/* - Free space in lru for @count new locks,
* redundant unused locks are canceled locally;
* - also cancel locally unused aged locks;
@@ -1040,14 +1097,14 @@ int ldlm_cancel_lru_local(struct ldlm_namespace *ns, struct list_head *cancels,
int count, int max, int flags)
{
cfs_time_t cur = cfs_time_current();
- int rc, added = 0, left, unused;
- struct ldlm_lock *lock, *next;
+ int added = 0, unused;
+ struct ldlm_lock *lock;
__u64 slv, lvf, lv;
ENTRY;
spin_lock(&ns->ns_unused_lock);
unused = ns->ns_nr_unused;
-
+
if (!ns_connect_lru_resize(ns))
count += unused - ns->ns_max_unused;
@@ -1071,7 +1128,7 @@ int ldlm_cancel_lru_local(struct ldlm_namespace *ns, struct list_head *cancels,
if (ns_connect_lru_resize(ns)) {
cfs_time_t la;
-
+
/* Take into account SLV only if cpount == 0. */
if (count == 0) {
/* Calculate lv for every lock. */
@@ -1084,7 +1141,7 @@ int ldlm_cancel_lru_local(struct ldlm_namespace *ns, struct list_head *cancels,
lock->l_last_used));
if (la == 0)
la = 1;
-
+
/* Stop when slv is not yet come from server
* or lv is smaller than it is. */
lv = lvf * la * unused;
@@ -1149,31 +1206,7 @@ int ldlm_cancel_lru_local(struct ldlm_namespace *ns, struct list_head *cancels,
}
spin_unlock(&ns->ns_unused_lock);
- /* Handle only @added inserted locks. */
- left = added;
- list_for_each_entry_safe(lock, next, cancels, l_bl_ast) {
- if (left-- == 0)
- break;
-
- rc = ldlm_cli_cancel_local(lock);
- if (rc == LDLM_FL_BL_AST) {
- CFS_LIST_HEAD(head);
-
- LDLM_DEBUG(lock, "Cancel lock separately");
- list_del_init(&lock->l_bl_ast);
- list_add(&lock->l_bl_ast, &head);
- ldlm_cli_cancel_req(lock->l_conn_export, &head, 1, 0);
- rc = LDLM_FL_LOCAL_ONLY;
- }
- if (rc == LDLM_FL_LOCAL_ONLY) {
- /* CANCEL RPC should not be sent to server. */
- list_del_init(&lock->l_bl_ast);
- LDLM_LOCK_PUT(lock);
- added--;
- }
-
- }
- RETURN(added);
+ RETURN(ldlm_cancel_list(cancels, added));
}
/* when called with LDLM_ASYNC the blocking callback will be handled
@@ -1211,8 +1244,8 @@ int ldlm_cancel_resource_local(struct ldlm_resource *res,
ldlm_mode_t mode, int lock_flags,
int flags, void *opaque)
{
- struct ldlm_lock *lock, *next;
- int count = 0, left;
+ struct ldlm_lock *lock;
+ int count = 0;
ENTRY;
lock_res(res);
@@ -1259,35 +1292,10 @@ int ldlm_cancel_resource_local(struct ldlm_resource *res,
}
unlock_res(res);
- /* Handle only @count inserted locks. */
- left = count;
- list_for_each_entry_safe(lock, next, cancels, l_bl_ast) {
- int rc = LDLM_FL_LOCAL_ONLY;
-
- if (left-- == 0)
- break;
- if (flags & LDLM_FL_LOCAL_ONLY)
- ldlm_lock_cancel(lock);
- else
- rc = ldlm_cli_cancel_local(lock);
-
- if (rc == LDLM_FL_BL_AST) {
- CFS_LIST_HEAD(head);
+ if ((flags & LDLM_FL_LOCAL_ONLY))
+ RETURN(ldlm_cancel_list_local(cancels, count));
- LDLM_DEBUG(lock, "Cancel lock separately");
- list_del_init(&lock->l_bl_ast);
- list_add(&lock->l_bl_ast, &head);
- ldlm_cli_cancel_req(lock->l_conn_export, &head, 1, 0);
- rc = LDLM_FL_LOCAL_ONLY;
- }
- if (rc == LDLM_FL_LOCAL_ONLY) {
- /* CANCEL RPC should not be sent to server. */
- list_del_init(&lock->l_bl_ast);
- LDLM_LOCK_PUT(lock);
- count--;
- }
- }
- RETURN(count);
+ RETURN(ldlm_cancel_list(cancels, count));
}
/* If @req is NULL, send CANCEL request to server with handles of locks