2022-05-23 20:44:03

by Dai Ngo

Subject: [PATCH 1/1] Add pynfs4.0 release lockowner test RLOWN2

From: root <[email protected]>

Add RLOWN2, similar to RLOWN1 but remove the file before release
lockowner. This test is to exercise to code path causing problem
of being blocked in nfsd_file_put while holding the cl_client lock.

Signed-off-by: Dai Ngo <[email protected]>
---
nfs4.0/servertests/st_releaselockowner.py | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

diff --git a/nfs4.0/servertests/st_releaselockowner.py b/nfs4.0/servertests/st_releaselockowner.py
index ccd10ff..50cef88 100644
--- a/nfs4.0/servertests/st_releaselockowner.py
+++ b/nfs4.0/servertests/st_releaselockowner.py
@@ -24,3 +24,28 @@ def testFile(t, env):
owner = lock_owner4(c.clientid, b"lockowner_RLOWN1")
res = c.compound([op.release_lockowner(owner)])
check(res)
+
+def testFile2(t, env):
+ """RELEASE_LOCKOWNER 2 - same as basic test but remove
+ file before release lockowner.
+
+ FLAGS: releaselockowner all
+ DEPEND:
+ CODE: RLOWN2
+ """
+ c = env.c1
+ c.init_connection()
+ fh, stateid = c.create_confirm(t.word())
+ res = c.lock_file(t.word(), fh, stateid, lockowner=b"lockowner_RLOWN1")
+ check(res)
+ res = c.unlock_file(1, fh, res.lockid)
+ check(res)
+
+ ops = c.use_obj(c.homedir) + [op.remove(t.word())]
+ res = c.compound(ops)
+ check(res)
+
+ # Release lockowner
+ owner = lock_owner4(c.clientid, b"lockowner_RLOWN1")
+ res = c.compound([op.release_lockowner(owner)])
+ check(res)
--
1.8.3.1

2022-05-23 21:21:10

by Chuck Lever III

Subject: Re: [PATCH 1/1] Add pynfs4.0 release lockowner test RLOWN2

> On May 23, 2022, at 3:42 PM, Dai Ngo <[email protected]> wrote:
>
> From: root <[email protected]>
>
> Add RLOWN2, similar to RLOWN1 but remove the file before release
> lockowner. This test is to exercise to code path causing problem
> of being blocked in nfsd_file_put while holding the cl_client lock.
>
> Signed-off-by: Dai Ngo <[email protected]>
> ---
> nfs4.0/servertests/st_releaselockowner.py | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
> diff --git a/nfs4.0/servertests/st_releaselockowner.py b/nfs4.0/servertests/st_releaselockowner.py
> index ccd10ff..50cef88 100644
> --- a/nfs4.0/servertests/st_releaselockowner.py
> +++ b/nfs4.0/servertests/st_releaselockowner.py
> @@ -24,3 +24,28 @@ def testFile(t, env):
> owner = lock_owner4(c.clientid, b"lockowner_RLOWN1")
> res = c.compound([op.release_lockowner(owner)])
> check(res)
> +
> +def testFile2(t, env):
> + """RELEASE_LOCKOWNER 2 - same as basic test but remove
> + file before release lockowner.
> +
> + FLAGS: releaselockowner all
> + DEPEND:
> + CODE: RLOWN2
> + """
> + c = env.c1
> + c.init_connection()
> + fh, stateid = c.create_confirm(t.word())
> + res = c.lock_file(t.word(), fh, stateid, lockowner=b"lockowner_RLOWN1")

Should probably be b"lockowner_RLOWN2"


> + check(res)
> + res = c.unlock_file(1, fh, res.lockid)
> + check(res)
> +
> + ops = c.use_obj(c.homedir) + [op.remove(t.word())]
> + res = c.compound(ops)
> + check(res)
> +
> + # Release lockowner
> + owner = lock_owner4(c.clientid, b"lockowner_RLOWN1")

Ditto.


> + res = c.compound([op.release_lockowner(owner)])
> + check(res)
> --
> 1.8.3.1
>

--
Chuck Lever