Commit 9706501e authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields

NLM: don't reattempt GRANT_MSG when there is already an RPC in flight

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: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 90bd17c8
...@@ -763,11 +763,20 @@ nlmsvc_grant_blocked(struct nlm_block *block) ...@@ -763,11 +763,20 @@ nlmsvc_grant_blocked(struct nlm_block *block)
dprintk("lockd: GRANTing blocked lock.\n"); dprintk("lockd: GRANTing blocked lock.\n");
block->b_granted = 1; block->b_granted = 1;
/* Schedule next grant callback in 30 seconds */ /* keep block on the list, but don't reattempt until the RPC
nlmsvc_insert_block(block, 30 * HZ); * completes or the submission fails
*/
nlmsvc_insert_block(block, NLM_NEVER);
/* Call the client */ /* Call the client -- use a soft RPC task since nlmsvc_retry_blocked
nlm_async_call(block->b_call, NLMPROC_GRANTED_MSG, &nlmsvc_grant_ops); * 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);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment