Attachment 306391 Details for Bug 254195 – patch 2 - don't reattempt GRANT_MSG when there is already an RPC in flight

[patch] patch 2 - don't reattempt GRANT_MSG when there is already an RPC in flight

03-bz-254195-nlm-don-t-reattempt-.patch (text/plain), 1.85 KB, created by Jeff Layton on 2008-05-22 15:29:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-05-22 15:29:13 UTC

Size: 1.85 KB

patch

obsolete

>BZ#254195: NLM: don't reattempt GRANT_MSG when there is already an RPC in flight
>
>From: Jeff Layton <jlayton@redhat.com>
>
>With the current scheme in nlmsvc_grant_blocked, we can end up with more
>than one GRANT_MSG callback for a block in flight. Right now, we requeue
>the block unconditionally so that a GRANT_MSG callback is done again in
>30s. If the client is unresponsive, it can take more than 30s for the
>call already in flight to time out.
>
>There's no benefit to having more than one GRANT_MSG RPC queued up at a
>time, so put it on the list with a timeout of NLM_NEVER before doing the
>RPC call. If the RPC call submission fails, we requeue it with a short
>timeout. If it works, then nlmsvc_grant_callback will end up requeueing
>it with a shorter timeout after it completes.
>
>Signed-off-by: Jeff Layton <jlayton@redhat.com>
>Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
>---
>
> fs/lockd/svclock.c |   17 +++++++++++++----
> 1 files changed, 13 insertions(+), 4 deletions(-)
>
>
>diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
>index 60ca5f1..bf9fd13 100644
>--- a/fs/lockd/svclock.c
>+++ b/fs/lockd/svclock.c
>@@ -767,11 +767,20 @@ callback:
> 	dprintk("lockd: GRANTing blocked lock.\n");
> 	block->b_granted = 1;
> 
>-	/* Schedule next grant callback in 30 seconds */
>-	nlmsvc_insert_block(block, 30 * HZ);
>+	/* keep block on the list, but don't reattempt until the RPC
>+	 * completes or the submission fails
>+	 */
>+	nlmsvc_insert_block(block, NLM_NEVER);
> 
>-	/* Call the client */
>-	nlm_async_call(block->b_call, NLMPROC_GRANTED_MSG, &nlmsvc_grant_ops);
>+	/* Call the client -- use a soft RPC task since nlmsvc_retry_blocked
>+	 * will queue up a new one if this one times out
>+	 */
>+	error = nlm_async_call(block->b_call, NLMPROC_GRANTED_MSG,
>+				&nlmsvc_grant_ops);
>+
>+	/* RPC submission failed, wait a bit and retry */
>+	if (error < 0)
>+		nlmsvc_insert_block(block, 10 * HZ);
> }
> 
> /*

Actions: View | Diff

Attachments on bug 254195: 277081 | 278361 | 280141 | 280151 | 280161 | 306390 | 306391 | 306392