Attachment 932433 Details for Bug 1120850 – [PATCH] lockd: allow rebinding to statd

[patch] [PATCH] lockd: allow rebinding to statd

TMP (text/plain), 2.48 KB, created by J. Bruce Fields on 2014-08-28 17:53:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J. Bruce Fields

Created: 2014-08-28 17:53:02 UTC

Size: 2.48 KB

patch

obsolete

>commit 55cbcd870c43
>Author: J. Bruce Fields <bfields@redhat.com>
>Date:   Wed Aug 20 17:21:32 2014 -0400
>
>    lockd: allow rebinding to statd
>    
>    During normal operation statd isn't restarted, but it may be if, for
>    example, the server is shut down and restarted to simulate a shutdown or
>    perform some kind of failover.  In that case the kernel may need to
>    query rpcbind again to get statd's new port number.
>    
>    Symptoms were locking failures after a manual server restart (without
>    rebooting the machine), and loopback network traces showing the new
>    kernel nfsd attempting to contact statd at its old port number.
>    
>    This was probably introduced by cb7323fffa85, which first allowed
>    reusing the statd rpc client, but it looks like a reference count may
>    typically have prevented any symptoms until e498daa81295 "LOCKD: Clear
>    ln->nsm_clnt only when ln->nsm_users is zero".
>    
>    That first commit also added the RPC_TASK_SOFTCONN flag, without any
>    explanation.  Perhaps it would be better, but it interferes with
>    autobinding.
>    
>    And, AUTOBIND doesn't seem to work; we never get to call_status, and
>    call_timeout doesn't see the right error?
>    
>    Fixes: cb7323fffa85 "lockd: create and use per-net NSM RPC clients on MON/UNMON requests"
>    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
>
>diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
>index 1812f026960c..3cf23f8a53f9 100644
>--- a/fs/lockd/mon.c
>+++ b/fs/lockd/mon.c
>@@ -80,7 +80,8 @@ static struct rpc_clnt *nsm_create(struct net *net)
> 		.program		= &nsm_program,
> 		.version		= NSM_VERSION,
> 		.authflavor		= RPC_AUTH_NULL,
>-		.flags			= RPC_CLNT_CREATE_NOPING,
>+		.flags			= RPC_CLNT_CREATE_NOPING|
>+			                  RPC_CLNT_CREATE_AUTOBIND,
> 	};
> 
> 	return rpc_create(&args);
>@@ -158,7 +159,7 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res,
> 	memset(res, 0, sizeof(*res));
> 
> 	msg.rpc_proc = &clnt->cl_procinfo[proc];
>-	status = rpc_call_sync(clnt, &msg, RPC_TASK_SOFTCONN);
>+	status = rpc_call_sync(clnt, &msg, 0);
> 	if (status < 0)
> 		dprintk("lockd: NSM upcall RPC failed, status=%d\n",
> 				status);
>diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
>index 2e6ab10734f6..4751ccf570c4 100644
>--- a/net/sunrpc/clnt.c
>+++ b/net/sunrpc/clnt.c
>@@ -1810,6 +1810,7 @@ call_connect_status(struct rpc_task *task)
> 	case -ECONNREFUSED:
> 	case -ECONNRESET:
> 	case -ECONNABORTED:
>+		rpc_force_rebind(clnt);
> 	case -ENETUNREACH:
> 	case -EHOSTUNREACH:
> 		if (RPC_IS_SOFTCONN(task))

Actions: View | Diff

Attachments on bug 1120850: 928949 | 932433 | 939392 | 940590