From: "Robert Milkowski" <rmilkowski@gmail.com>
To: "'Trond Myklebust'" <trondmy@hammerspace.com>,
<linux-nfs@vger.kernel.org>
Cc: <anna.schumaker@netapp.com>, <linux-kernel@vger.kernel.org>,
<chuck.lever@oracle.com>
Subject: RE: [PATCH v2] NFSv4: try lease recovery on NFS4ERR_EXPIRED
Date: Wed, 22 Jan 2020 14:20:09 -0000 [thread overview]
Message-ID: <06bd01d5d12f$0e2288b0$2a679a10$@gmail.com> (raw)
In-Reply-To: <962370db9ae3ba5a17ba390afe7f9de6cea571d4.camel@hammerspace.com>
> -----Original Message-----
> From: Trond Myklebust <trondmy@hammerspace.com>
> Sent: 17 January 2020 17:24
> To: linux-nfs@vger.kernel.org; rmilkowski@gmail.com
> Cc: anna.schumaker@netapp.com; linux-kernel@vger.kernel.org;
> chuck.lever@oracle.com
> Subject: Re: [PATCH v2] NFSv4: try lease recovery on NFS4ERR_EXPIRED
>
> On Fri, 2020-01-17 at 16:12 +0000, Robert Milkowski wrote:
> > Anyone please?
> >
> >
> > -----Original Message-----
> > From: Robert Milkowski <rmilkowski@gmail.com>
> > Sent: 08 January 2020 21:48
> > To: linux-nfs@vger.kernel.org
> > Cc: 'Trond Myklebust' <trondmy@hammerspace.com>; 'Chuck Lever'
> > <chuck.lever@oracle.com>; 'Anna Schumaker' <anna.schumaker@netapp.com
> > >;
> > linux-kernel@vger.kernel.org
> > Subject: [PATCH v2] NFSv4: try lease recovery on NFS4ERR_EXPIRED
> >
> > From: Robert Milkowski <rmilkowski@gmail.com>
> >
> > Currently, if an nfs server returns NFS4ERR_EXPIRED to open(), etc.
> > we return EIO to applications without even trying to recover.
> >
> > Fixes: 272289a3df72 ("NFSv4: nfs4_do_handle_exception() handle
> > revoke/expiry of a single stateid")
> > Signed-off-by: Robert Milkowski <rmilkowski@gmail.com>
> > ---
> > fs/nfs/nfs4proc.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index
> > 76d3716..2478405
> > 100644
> > --- a/fs/nfs/nfs4proc.c
> > +++ b/fs/nfs/nfs4proc.c
> > @@ -481,6 +481,10 @@ static int nfs4_do_handle_exception(struct
> > nfs_server *server,
> > stateid);
> > goto wait_on_recovery;
> > }
> > + if (state == NULL) {
> > + nfs4_schedule_lease_recovery(clp);
> > + goto wait_on_recovery;
> > + }
> > /* Fall through */
> > case -NFS4ERR_OPENMODE:
> > if (inode) {
> > --
> > 1.8.3.1
> >
> >
>
> Does this apply to any case other than NFS4ERR_EXPIRED in the specific
> case of nfs4_do_open()? I can't see that it does. It looks to me as if
> the open recovery routines already have their own handling of this case.
I only observed the issue with open(). After further
review I think you are right and it only applies to nfs4_do_open().
>
> If so, why not just add it as a special case in the nfs4_do_open() error
> handling? Otherwise this patch will end up overriding other generic
> cases where we have an inode, but no open state.
>
Fair point.
So perhaps, few lines further instead of:
if (inode) {
...
if (state == NULL) {
break;
}
There should be:
if (inode) {
...
if (state == NULL) {
nfs4_schedule_lease_recovery(clp);
goto wait_on_recovery;
}
This way we know that inode cannot be null at this point, and it's a case where both inode and state are NULL.
This would be a little bit more general in case we reach this point.
But if you think it is better to move it to nfs4_do_open() then I've just tested the following patch:
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 76d3716..b7c4044 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3187,6 +3187,11 @@ static struct nfs4_state *nfs4_do_open(struct inode *dir,
exception.retry = 1;
continue;
}
+ if (status == -NFS4ERR_EXPIRED) {
+ nfs4_schedule_lease_recovery(server->nfs_client);
+ exception.retry = 1;
+ continue;
+ }
if (status == -EAGAIN) {
/* We must have found a delegation */
exception.retry = 1;
Please let me know which way you want to proceed and I will submit an updated patch.
> Note that _nfs4_do_open() already waits for lease recovery, so we only
> need the call to nfs_schedule_lease_recovery().
>
Yep
--
Robert Milkowski
next prev parent reply other threads:[~2020-01-22 14:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 21:48 [PATCH v2] NFSv4: try lease recovery on NFS4ERR_EXPIRED Robert Milkowski
2020-01-17 16:12 ` Robert Milkowski
2020-01-17 17:24 ` Trond Myklebust
2020-01-22 14:20 ` Robert Milkowski [this message]
2020-01-23 19:33 ` Trond Myklebust
2020-01-27 14:46 ` Robert Milkowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='06bd01d5d12f$0e2288b0$2a679a10$@gmail.com' \
--to=rmilkowski@gmail.com \
--cc=anna.schumaker@netapp.com \
--cc=chuck.lever@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trondmy@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).