sunrpc: fix NFSACL RPC retry on soft mount
Subsystems (3)
PATCH 1/1 sunrpc: fix NFSACL RPC retry on soft mount
It used to be quite awhile ago since 1b63a75180c6 ('SUNRPC: Refactor rpc_clone_client()'), in 2012, that cl_timeout was copied in so that all mount parameters propagate to NFSACL clients. However since that change, if mount options as follows are given:
soft,timeo=50,retrans=16,vers=3
The resultant NFSACL client receives:
cl_softrtry: 1
cl_timeout: to_initval=60000, to_maxval=60000, to_increment=0, to_retries=2, to_exponential=0These values lead to NFSACL operations not being retried under the condition of transient network outages with soft mount. Instead, getacl call fails after 60 seconds with EIO.
The simple fix is to pass the existing client's cl_timeout as the new client timeout.
--- net/sunrpc/clnt.c | 1 + 1 file changed, 1 insertion(+)
net/sunrpc/clnt.c +1 -0
@@ -1068,6 +1068,7 @@ struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *old, .version = vers, .authflavor = old->cl_auth->au_flavor, .cred = old->cl_cred, + .timeout = old->cl_timeout, };struct rpc_clnt *clnt;int err;
Signature · 1 line
2.39.3
Quoted 16 lines · Dan Aloni
It used to be quite awhile ago since
1b63a75180c6('SUNRPC: Refactorrpc_clone_client()'), in 2012, thatcl_timeoutwas copied in so that all mount parameters propagate to NFSACL clients. However since that change, if mount options as follows are given:soft,timeo=50,retrans=16,vers=3The resultant NFSACL client receives:
cl_softrtry: 1 cl_timeout: to_initval=60000, to_maxval=60000, to_increment=0, to_retries=2, to_exponential=0These values lead to NFSACL operations not being retried under the condition of transient network outages with soft mount. Instead, getacl call fails after 60 seconds with EIO.
Quoted 8 lines
The simple fix is to pass the existing client's
cl_timeoutas the new client timeout.Cc Chuck Lever <[email protected]>Cc Benjamin Coddington <[email protected]>Fixes 1b63a75180c6 ('SUNRPC: Refactor rpc_clone_client()')Signed-off-by Dan Aloni <[email protected]>
This also affects the local rpcbind, and makes the change in 6b996476f364 sunrpc: honor rpc_task's timeout value in rpcb_create() redundant. Just an observation, thanks for fixing this!
Ben
Quoted 18 lines
--- net/sunrpc/clnt.c | 1 + 1 file changed, 1 insertion(+)net/sunrpc/clnt.c +1
-0@@ -1068,6 +1068,7 @@ struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *old, .version = vers, .authflavor = old->cl_auth->au_flavor, .cred = old->cl_cred, + .timeout = old->cl_timeout, };struct rpc_clnt *clnt;int err;Signature · 1 line
2.39.3