Commit 537935f7 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS/pNFS: Set the connect timeout for the pNFS flexfiles driver 



Ensure that the connect timeout for the pNFS flexfiles driver is of the
same order as the I/O timeout, so that we can fail over quickly when
trying to read from a data server that is down.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent cd18f240

fs/nfs/client.c

+2 −0
Original line number Diff line number Diff line
@@ -517,6 +517,8 @@ int nfs_create_rpc_client(struct nfs_client *clp, 
		.authflavor	= flavor,

		.cred		= cl_init->cred,

		.xprtsec	= cl_init->xprtsec,

		.connect_timeout = cl_init->connect_timeout,

		.reconnect_timeout = cl_init->reconnect_timeout,

	};



	if (test_bit(NFS_CS_DISCRTRY, &clp->cl_flags))

fs/nfs/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ struct nfs_client_initdata { 
	const struct rpc_timeout *timeparms;

	const struct cred *cred;

	struct xprtsec_parms xprtsec;

	unsigned long connect_timeout;

	unsigned long reconnect_timeout;

};



/*

fs/nfs/nfs3client.c

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, 
		int ds_proto, unsigned int ds_timeo, unsigned int ds_retrans)

{

	struct rpc_timeout ds_timeout;

	unsigned long connect_timeout = ds_timeo * (ds_retrans + 1) * HZ / 10;

	struct nfs_client *mds_clp = mds_srv->nfs_client;

	struct nfs_client_initdata cl_init = {

		.addr = ds_addr,
@@ -98,6 +99,8 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, 
		.timeparms = &ds_timeout,

		.cred = mds_srv->cred,

		.xprtsec = mds_clp->cl_xprtsec,

		.connect_timeout = connect_timeout,

		.reconnect_timeout = connect_timeout,

	};

	struct nfs_client *clp;

	char buf[INET6_ADDRSTRLEN + 1];

fs/nfs/pnfs_nfs.c

+3 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv, 
{

	struct nfs_client *clp = ERR_PTR(-EIO);

	struct nfs4_pnfs_ds_addr *da;

	unsigned long connect_timeout = timeo * (retrans + 1) * HZ / 10;

	int status = 0;



	dprintk("--> %s DS %s\n", __func__, ds->ds_remotestr);
@@ -870,6 +871,8 @@ static int _nfs4_pnfs_v3_ds_connect(struct nfs_server *mds_srv, 
				.dstaddr = (struct sockaddr *)&da->da_addr,

				.addrlen = da->da_addrlen,

				.servername = clp->cl_hostname,

				.connect_timeout = connect_timeout,

				.reconnect_timeout = connect_timeout,

			};



			if (da->da_transport != clp->cl_proto)