leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFSv4: Cap the transport reconnection timer at 1/2 lease period

Browse Source 
We don't want to miss a lease period renewal due to the TCP connection
failing to reconnect in a timely fashion. To ensure this doesn't happen,
cap the reconnection timer so that we retry the connection attempt
at least every 1/2 lease period.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2016-08-05 19:03:31 -04:00
parent fb10fb67ad
commit 8d480326c3
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/nfs4renewd.c
View File

@ -151,6 +151,9 @@ void nfs4_set_lease_period(struct nfs_client *clp,
clp->cl_lease_time = lease; clp->cl_lease_time = lease;
clp->cl_last_renewal = lastrenewed; clp->cl_last_renewal = lastrenewed;
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
/* Cap maximum reconnect timeout at 1/2 lease period */
rpc_cap_max_reconnect_timeout(clp->cl_rpcclient, lease >> 1);
} }
/* /*

2
include/linux/sunrpc/clnt.h
View File

@ -195,6 +195,8 @@ int rpc_clnt_add_xprt(struct rpc_clnt *, struct xprt_create *,
struct rpc_xprt *, struct rpc_xprt *,
void *), void *),
void *data); void *data);
void rpc_cap_max_reconnect_timeout(struct rpc_clnt *clnt,
unsigned long timeo);
const char *rpc_proc_name(const struct rpc_task *task); const char *rpc_proc_name(const struct rpc_task *task);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

21
net/sunrpc/clnt.c
View File

@ -2676,6 +2676,27 @@ out_put_switch:
} }
EXPORT_SYMBOL_GPL(rpc_clnt_add_xprt); EXPORT_SYMBOL_GPL(rpc_clnt_add_xprt);
static int
rpc_xprt_cap_max_reconnect_timeout(struct rpc_clnt *clnt,
struct rpc_xprt *xprt,
void *data)
{
unsigned long timeout = *((unsigned long *)data);
if (timeout < xprt->max_reconnect_timeout)
xprt->max_reconnect_timeout = timeout;
return 0;
}
void
rpc_cap_max_reconnect_timeout(struct rpc_clnt *clnt, unsigned long timeo)
{
rpc_clnt_iterate_for_each_xprt(clnt,
rpc_xprt_cap_max_reconnect_timeout,
&timeo);
}
EXPORT_SYMBOL_GPL(rpc_cap_max_reconnect_timeout);
#if IS_ENABLED(CONFIG_SUNRPC_DEBUG) #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
static void rpc_show_header(void) static void rpc_show_header(void)
{ {