Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98fc685a authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFSv4.1 data server timeo and retrans module parameters 



Set the recovery parameters for data servers.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 9f0ec176

fs/nfs/client.c

+4 −8
Original line number Diff line number Diff line
@@ -1477,8 +1477,8 @@ static int nfs4_set_client(struct nfs_server *server, 
 * the MDS.

 */

struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,

		const struct sockaddr *ds_addr,

		int ds_addrlen, int ds_proto)

		const struct sockaddr *ds_addr, int ds_addrlen,

		int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans)

{

	struct nfs_client_initdata cl_init = {

		.addr = ds_addr,
@@ -1488,12 +1488,7 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp, 
		.minorversion = mds_clp->cl_minorversion,

		.net = mds_clp->net,

	};

	struct rpc_timeout ds_timeout = {

		.to_initval = 15 * HZ,

		.to_maxval = 15 * HZ,

		.to_retries = 1,

		.to_exponential = 1,

	};

	struct rpc_timeout ds_timeout;

	struct nfs_client *clp;



	/*
@@ -1501,6 +1496,7 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp, 
	 * cl_ipaddr so as to use the same EXCHANGE_ID co_ownerid as the MDS

	 * (section 13.1 RFC 5661).

	 */

	nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans);

	clp = nfs_get_client(&cl_init, &ds_timeout, mds_clp->cl_ipaddr,

			     mds_clp->cl_rpcclient->cl_auth->au_flavor, 0);

fs/nfs/internal.h

+3 −1
Original line number Diff line number Diff line
@@ -172,7 +172,9 @@ extern void nfs_mark_client_ready(struct nfs_client *clp, int state); 
extern int nfs4_check_client_ready(struct nfs_client *clp);

extern struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,

					     const struct sockaddr *ds_addr,

					     int ds_addrlen, int ds_proto);

					     int ds_addrlen, int ds_proto,

					     unsigned int ds_timeo,

					     unsigned int ds_retrans);

#ifdef CONFIG_PROC_FS

extern int __init nfs_fs_proc_init(void);

extern void nfs_fs_proc_exit(void);

fs/nfs/nfs4filelayout.h

+7 −0
Original line number Diff line number Diff line
@@ -32,6 +32,13 @@ 


#include "pnfs.h"



/*

 * Default data server connection timeout and retrans vaules.

 * Set by module paramters dataserver_timeo and dataserver_retrans.

 */

#define NFS4_DEF_DS_TIMEO   60

#define NFS4_DEF_DS_RETRANS 5



/*

 * Field testing shows we need to support up to 4096 stripe indices.

 * We store each index as a u8 (u32 on the wire) to keep the memory footprint

fs/nfs/nfs4filelayoutdev.c

+16 −2
Original line number Diff line number Diff line
@@ -30,12 +30,16 @@ 


#include <linux/nfs_fs.h>

#include <linux/vmalloc.h>

#include <linux/module.h>



#include "internal.h"

#include "nfs4filelayout.h"



#define NFSDBG_FACILITY		NFSDBG_PNFS_LD



static unsigned int dataserver_timeo = NFS4_DEF_DS_TIMEO;

static unsigned int dataserver_retrans = NFS4_DEF_DS_RETRANS;



/*

 * Data server cache

 *
@@ -166,7 +170,8 @@ nfs4_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds) 


		clp = nfs4_set_ds_client(mds_srv->nfs_client,

					(struct sockaddr *)&da->da_addr,

				 da->da_addrlen, IPPROTO_TCP);

					da->da_addrlen, IPPROTO_TCP,

					dataserver_timeo, dataserver_retrans);

		if (!IS_ERR(clp))

			break;

	}
@@ -821,3 +826,12 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx) 
	filelayout_mark_devid_invalid(devid);

	return NULL;

}



module_param(dataserver_retrans, uint, 0644);

MODULE_PARM_DESC(dataserver_retrans, "The  number of times the NFSv4.1 client "

			"retries a request before it attempts further "

			" recovery  action.");

module_param(dataserver_timeo, uint, 0644);

MODULE_PARM_DESC(dataserver_timeo, "The time (in tenths of a second) the "

			"NFSv4.1  client  waits for a response from a "

			" data server before it retries an NFS request.");