Commit b6b6152c authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Trond Myklebust
Browse files

rpc: bring back cl_chatty 



The cl_chatty flag alows us to control whether a given rpc client leaves

	"server X not responding, timed out"

messages in the syslog.  Such messages make sense for ordinary nfs
clients (where an unresponsive server means applications on the
mountpoint are probably hanging), but not for the callback client (which
can fail more commonly, with the only result just of disabling some
optimizations).

Previously cl_chatty was removed, do to lack of users; reinstate it, and
use it for the nfsd's callback client.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 48b605f8

fs/nfsd/nfs4callback.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -381,7 +381,7 @@ static int do_probe_callback(void *data) 
		.program	= &cb_program,

		.program	= &cb_program,

		.version	= nfs_cb_version[1]->number,

		.version	= nfs_cb_version[1]->number,

		.authflavor	= RPC_AUTH_UNIX, /* XXX: need AUTH_GSS... */

		.authflavor	= RPC_AUTH_UNIX, /* XXX: need AUTH_GSS... */

		.flags		= (RPC_CLNT_CREATE_NOPING),

		.flags		= (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),

	};

	};

	struct rpc_message msg = {

	struct rpc_message msg = {

		.rpc_proc       = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],

		.rpc_proc       = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],

include/linux/sunrpc/clnt.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,8 @@ struct rpc_clnt { 




	unsigned int		cl_softrtry : 1,/* soft timeouts */

	unsigned int		cl_softrtry : 1,/* soft timeouts */

				cl_discrtry : 1,/* disconnect before retry */

				cl_discrtry : 1,/* disconnect before retry */

				cl_autobind : 1;/* use getport() */

				cl_autobind : 1,/* use getport() */

				cl_chatty   : 1;/* be verbose */





	struct rpc_rtt *	cl_rtt;		/* RTO estimator data */

	struct rpc_rtt *	cl_rtt;		/* RTO estimator data */

	const struct rpc_timeout *cl_timeout;	/* Timeout strategy */

	const struct rpc_timeout *cl_timeout;	/* Timeout strategy */
@@ -114,6 +115,7 @@ struct rpc_create_args { 
#define RPC_CLNT_CREATE_NONPRIVPORT	(1UL << 3)

#define RPC_CLNT_CREATE_NONPRIVPORT	(1UL << 3)

#define RPC_CLNT_CREATE_NOPING		(1UL << 4)

#define RPC_CLNT_CREATE_NOPING		(1UL << 4)

#define RPC_CLNT_CREATE_DISCRTRY	(1UL << 5)

#define RPC_CLNT_CREATE_DISCRTRY	(1UL << 5)

#define RPC_CLNT_CREATE_QUIET		(1UL << 6)





struct rpc_clnt *rpc_create(struct rpc_create_args *args);

struct rpc_clnt *rpc_create(struct rpc_create_args *args);

struct rpc_clnt	*rpc_bind_new_program(struct rpc_clnt *,

struct rpc_clnt	*rpc_bind_new_program(struct rpc_clnt *,

net/sunrpc/clnt.c

+11 −5
Original line number Original line Diff line number Diff line
@@ -324,6 +324,8 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) 
		clnt->cl_autobind = 1;

		clnt->cl_autobind = 1;

	if (args->flags & RPC_CLNT_CREATE_DISCRTRY)

	if (args->flags & RPC_CLNT_CREATE_DISCRTRY)

		clnt->cl_discrtry = 1;

		clnt->cl_discrtry = 1;

	if (!(args->flags & RPC_CLNT_CREATE_QUIET))

		clnt->cl_chatty = 1;





	return clnt;

	return clnt;

}

}
@@ -1149,6 +1151,7 @@ call_status(struct rpc_task *task) 
		rpc_exit(task, status);

		rpc_exit(task, status);

		break;

		break;

	default:

	default:

		if (clnt->cl_chatty)

			printk("%s: RPC call returned error %d\n",

			printk("%s: RPC call returned error %d\n",

			       clnt->cl_protname, -status);

			       clnt->cl_protname, -status);

		rpc_exit(task, status);

		rpc_exit(task, status);
@@ -1174,6 +1177,7 @@ call_timeout(struct rpc_task *task) 
	task->tk_timeouts++;

	task->tk_timeouts++;





	if (RPC_IS_SOFT(task)) {

	if (RPC_IS_SOFT(task)) {

		if (clnt->cl_chatty)

			printk(KERN_NOTICE "%s: server %s not responding, timed out\n",

			printk(KERN_NOTICE "%s: server %s not responding, timed out\n",

				clnt->cl_protname, clnt->cl_server);

				clnt->cl_protname, clnt->cl_server);

		rpc_exit(task, -EIO);

		rpc_exit(task, -EIO);
@@ -1182,6 +1186,7 @@ call_timeout(struct rpc_task *task) 




	if (!(task->tk_flags & RPC_CALL_MAJORSEEN)) {

	if (!(task->tk_flags & RPC_CALL_MAJORSEEN)) {

		task->tk_flags |= RPC_CALL_MAJORSEEN;

		task->tk_flags |= RPC_CALL_MAJORSEEN;

		if (clnt->cl_chatty)

			printk(KERN_NOTICE "%s: server %s not responding, still trying\n",

			printk(KERN_NOTICE "%s: server %s not responding, still trying\n",

			clnt->cl_protname, clnt->cl_server);

			clnt->cl_protname, clnt->cl_server);

	}

	}
@@ -1213,6 +1218,7 @@ call_decode(struct rpc_task *task) 
			task->tk_pid, task->tk_status);

			task->tk_pid, task->tk_status);





	if (task->tk_flags & RPC_CALL_MAJORSEEN) {

	if (task->tk_flags & RPC_CALL_MAJORSEEN) {

		if (clnt->cl_chatty)

			printk(KERN_NOTICE "%s: server %s OK\n",

			printk(KERN_NOTICE "%s: server %s OK\n",

				clnt->cl_protname, clnt->cl_server);

				clnt->cl_protname, clnt->cl_server);

		task->tk_flags &= ~RPC_CALL_MAJORSEEN;

		task->tk_flags &= ~RPC_CALL_MAJORSEEN;

CRA Git | Maintained and supported by SUSTech CRA and CCSE