Messages in this thread Patch in this message | | | Date | Fri, 15 May 2015 10:06:14 +0200 | From | Willy Tarreau <> | Subject | [ 44/48] lockd: Try to reconnect if statd has moved |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <bcodding@redhat.com>
commit 173b3afceebe76fa2205b2c8808682d5b541fe3c upstream.
If rpc.statd is restarted, upcalls to monitor hosts can fail with ECONNREFUSED. In that case force a lookup of statd's new port and retry the upcall.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> [bwh: Backported to 3.2: not using RPC_TASK_SOFTCONN] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> (cherry picked from commit 3aabe891f32c209a2be7cd5581d2634020e801c1)
Signed-off-by: Willy Tarreau <w@1wt.eu> --- fs/lockd/mon.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index f956651..48de6a5 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -109,6 +109,12 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res) msg.rpc_proc = &clnt->cl_procinfo[proc]; status = rpc_call_sync(clnt, &msg, 0); + if (status == -ECONNREFUSED) { + dprintk("lockd: NSM upcall RPC failed, status=%d, forcing rebind\n", + status); + rpc_force_rebind(clnt); + status = rpc_call_sync(clnt, &msg, 0); + } if (status < 0) dprintk("lockd: NSM upcall RPC failed, status=%d\n", status); -- 1.7.12.2.21.g234cd45.dirty
| |