2015-10-16 20:44:55

by Frank Filz

Subject: Pull request for pynfs

Bruce,

Please pull the top patch from:

https://github.com/ffilz/pynfs/commits/master

It fixes CID2 to allow NFS4_OK when SETCLIENTID with a different principal
replaces a clientid that has no state, and adds CID2a which expects
NFS4ERR_CLID_INUSE since it does have state.

Thanks

Frank


---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus

2015-10-19 21:48:04

by J. Bruce Fields

Subject: Re: Pull request for pynfs

On Fri, Oct 16, 2015 at 01:44:42PM -0700, Frank Filz wrote:
> Bruce,
>
> Please pull the top patch from:
>
> https://github.com/ffilz/pynfs/commits/master
>
> It fixes CID2 to allow NFS4_OK when SETCLIENTID with a different principal
> replaces a clientid that has no state, and adds CID2a which expects
> NFS4ERR_CLID_INUSE since it does have state.

Thanks!

This leave us with two test functions both named "testInUse".

I applied the following to get both tests working.

--b.

diff --git a/nfs4.0/servertests/st_setclientid.py b/nfs4.0/servertests/st_setclientid.py
index 0fb59cd7f542..fbeab22e5026 100644
--- a/nfs4.0/servertests/st_setclientid.py
+++ b/nfs4.0/servertests/st_setclientid.py
@@ -50,7 +50,7 @@ def testClientUpdateCallback(t, env):
res = c.close_file(t.code, fh, stateid)
check(res, msg="Close after updating callback info")

-def testInUse(t, env):
+def testNotInUse(t, env):
"""SETCLIENTID with same nfs_client_id.id should return NFS4ERR_OK
if there is no active state

2015-10-19 22:01:11

by Frank Filz

Subject: RE: Pull request for pynfs

> On Fri, Oct 16, 2015 at 01:44:42PM -0700, Frank Filz wrote:
> > Bruce,
> >
> > Please pull the top patch from:
> >
> > https://github.com/ffilz/pynfs/commits/master
> >
> > It fixes CID2 to allow NFS4_OK when SETCLIENTID with a different
> > principal replaces a clientid that has no state, and adds CID2a which
> > expects NFS4ERR_CLID_INUSE since it does have state.
>
> Thanks!
>
> This leave us with two test functions both named "testInUse".
>
> I applied the following to get both tests working.

Oops, sorry...

Frank

> diff --git a/nfs4.0/servertests/st_setclientid.py
> b/nfs4.0/servertests/st_setclientid.py
> index 0fb59cd7f542..fbeab22e5026 100644
> --- a/nfs4.0/servertests/st_setclientid.py
> +++ b/nfs4.0/servertests/st_setclientid.py
> @@ -50,7 +50,7 @@ def testClientUpdateCallback(t, env):
> res = c.close_file(t.code, fh, stateid)
> check(res, msg="Close after updating callback info")
>
> -def testInUse(t, env):
> +def testNotInUse(t, env):
> """SETCLIENTID with same nfs_client_id.id should return NFS4ERR_OK
> if there is no active state
>


---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus