From: Tom Haynes <loghyr@primarydata.com>
To: "J. Bruce Fields" <bfields@redhat.com>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH pynfs 11/12] Factor out checking seqid for flex file layouts
Date: Sat, 26 Nov 2016 22:26:40 -0800 [thread overview]
Message-ID: <1480228001-64821-12-git-send-email-loghyr@primarydata.com> (raw)
In-Reply-To: <1480228001-64821-1-git-send-email-loghyr@primarydata.com>
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
---
nfs4.1/server41tests/st_flex.py | 48 +++++++++++++++++++------------------=
----
1 file changed, 22 insertions(+), 26 deletions(-)
diff --git a/nfs4.1/server41tests/st_flex.py b/nfs4.1/server41tests/st_flex=
.py
index 6398592..06dbba8 100644
--- a/nfs4.1/server41tests/st_flex.py
+++ b/nfs4.1/server41tests/st_flex.py
@@ -10,6 +10,10 @@ from nfs4lib import FancyNFS4Packer, get_nfstime
=20
current_stateid =3D stateid4(1, '\0' * 12)
=20
+def check_seqid(stateid, seqid):
+ if stateid.seqid !=3D seqid:
+ fail("Expected stateid.seqid=3D=3D%i, got %i" % (seqid, stateid.se=
qid))
+
def testStateid1(t, env):
"""Check for proper sequence handling in layout stateids.
=20
@@ -29,11 +33,12 @@ def testStateid1(t, env):
res =3D sess.compound(ops)
check(res)
lo_stateid =3D res.resarray[-1].logr_stateid
- if lo_stateid.seqid !=3D 1:
- # From draft23 12.5.2 "The first successful LAYOUTGET processed by
- # the server using a non-layout stateid as an argument MUST have t=
he
- # "seqid" field of the layout stateid in the response set to one."
- fail("Expected stateid.seqid=3D=3D1, got %i" % lo_stateid.seqid)
+
+ # From draft23 12.5.2 "The first successful LAYOUTGET processed by
+ # the server using a non-layout stateid as an argument MUST have the
+ # "seqid" field of the layout stateid in the response set to one."
+ check_seqid(lo_stateid, 1)
+
for i in range(6):
# Get subsequent layouts
ops =3D [op.putfh(fh),
@@ -42,11 +47,10 @@ def testStateid1(t, env):
res =3D sess.compound(ops)
check(res)
lo_stateid =3D res.resarray[-1].logr_stateid
- if lo_stateid.seqid !=3D i + 2:
- # From draft23 12.5.3 "After the layout stateid is established=
,
- # the server increments by one the value of the "seqid" in eac=
h
- # subsequent LAYOUTGET and LAYOUTRETURN response,
- fail("Expected stateid.seqid=3D=3D%i, got %i" % (i+2, lo_state=
id.seqid))
+ # From draft23 12.5.3 "After the layout stateid is established,
+ # the server increments by one the value of the "seqid" in each
+ # subsequent LAYOUTGET and LAYOUTRETURN response,
+=09check_seqid(lo_stateid, i + 2)
res =3D close_file(sess, fh, stateid=3Dopen_stateid)
check(res)
=20
@@ -133,8 +137,7 @@ def testFlexLayoutOldSeqid(t, env):
check(res)
lo_stateid =3D res.resarray[-1].logr_stateid
=20
- if lo_stateid.seqid !=3D seqid_next:
- fail("Expected stateid.seqid=3D=3D%i, got %i" % (seqid_next, lo_st=
ateid.seqid))
+ check_seqid(lo_stateid, seqid_next)
seqid_next +=3D 1
=20
# Get the first with the lo_stateid
@@ -146,8 +149,7 @@ def testFlexLayoutOldSeqid(t, env):
check(res)
lo_stateid2 =3D res.resarray[-1].logr_stateid
=20
- if lo_stateid2.seqid !=3D seqid_next:
- fail("Expected stateid.seqid=3D=3D%i, got %i" % (seqid_next, lo_st=
ateid2.seqid))
+ check_seqid(lo_stateid2, seqid_next)
seqid_next +=3D 1
=20
# Get the second with the original lo_stateid
@@ -159,8 +161,7 @@ def testFlexLayoutOldSeqid(t, env):
check(res)
lo_stateid3 =3D res.resarray[-1].logr_stateid
=20
- if lo_stateid3.seqid !=3D seqid_next:
- fail("Expected stateid.seqid=3D=3D%i, got %i" % (seqid_next, lo_st=
ateid3.seqid))
+ check_seqid(lo_stateid3, seqid_next)
seqid_next +=3D 1
=20
ops =3D [op.putfh(fh),
@@ -196,8 +197,7 @@ def testFlexLayoutStress(t, env):
res =3D sess.compound(ops)
check(res)
lo_stateid =3D res.resarray[-1].logr_stateid
- if lo_stateid.seqid !=3D seqid_next:
- fail("Expected stateid.seqid=3D=3D%i, got %i" % (seqid_next, l=
o_stateid.seqid))
+ check_seqid(lo_stateid, seqid_next)
seqid_next +=3D 1
=20
ops =3D [op.putfh(fh),
@@ -231,8 +231,7 @@ def testFlexGetDevInfo(t, env):
res =3D sess.compound(ops)
check(res)
lo_stateid =3D res.resarray[-1].logr_stateid
- if lo_stateid.seqid !=3D 1:
- fail("Expected stateid.seqid=3D=3D%i, got %i" % (1, lo_stateid.seq=
id))
+ check_seqid(lo_stateid, 1)
=20
layout =3D res.resarray[-1].logr_layout[-1]
p =3D FlexUnpacker(layout.loc_body)
@@ -280,8 +279,7 @@ def testFlexLayoutTestAccess(t, env):
res =3D sess.compound(ops)
check(res)
lo_stateid =3D res.resarray[-1].logr_stateid
- if lo_stateid.seqid !=3D 1:
- fail("Expected stateid.seqid=3D=3D%i, got %i" % (1, lo_stateid.seq=
id))
+ check_seqid(lo_stateid, 1)
=20
layout =3D res.resarray[-1].logr_layout[-1]
p =3D FlexUnpacker(layout.loc_body)
@@ -301,8 +299,7 @@ def testFlexLayoutTestAccess(t, env):
res =3D sess.compound(ops)
check(res)
lo_stateid =3D res.resarray[-1].logr_stateid
- if lo_stateid.seqid !=3D 2:
- fail("Expected stateid.seqid=3D=3D%i, got %i" % (2, lo_stateid.seq=
id))
+ check_seqid(lo_stateid, 2)
=20
layout =3D res.resarray[-1].logr_layout[-1]
p =3D FlexUnpacker(layout.loc_body)
@@ -351,8 +348,7 @@ def testFlexLayoutStatsSmall(t, env):
fh =3D res.resarray[-2].object
open_stateid =3D res.resarray[-3].stateid
=20
- if lo_stateid.seqid !=3D 1:
- fail("Expected stateid.seqid=3D=3D%i, got %i" % (1, lo_stateid=
.seqid))
+ check_seqid(lo_stateid, 1)
=20
layout =3D res.resarray[-1].logr_layout[-1]
p =3D FlexUnpacker(layout.loc_body)
--=20
2.3.6
next prev parent reply other threads:[~2016-11-27 6:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-27 6:26 [PATCH pynfs 00/12] Flex File support Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 01/12] According to RFC7863, this is not an array Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 02/12] Close the files opened in the OPEN tests Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 03/12] Some more file closes to cleanup state on the server Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 04/12] Get rid of the client records as well as the session records Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 05/12] Really, really close those open temp files to remove state on the server Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 06/12] Add xdr for Flex Files Layout Type Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 07/12] Simple tests of the flex file layout type Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 08/12] Add a check to see if NFS4ERR_OLD_STATEID is issued on concurrent layoutgets Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 09/12] Check that the flex file access uid/gid are correct for the different iomodes Tom Haynes
2016-11-27 6:26 ` [PATCH pynfs 10/12] FFLS1: Simulate LAYOUTSTATS for 20 small file creations Tom Haynes
2016-11-27 6:26 ` Tom Haynes [this message]
2016-11-27 6:26 ` [PATCH pynfs 12/12] Add layoutstats tests for flex files Tom Haynes
2016-11-28 17:22 ` J. Bruce Fields
2016-11-28 17:52 ` Tom Haynes
2016-11-28 16:33 ` [PATCH pynfs 00/12] Flex File support J. Bruce Fields
2016-11-28 16:53 ` Tom Haynes
2016-11-28 21:47 ` J. Bruce Fields
2016-11-28 23:38 ` Tom Haynes
2016-11-29 1:55 ` J. Bruce Fields
2016-11-29 23:44 ` Frank Filz
2016-11-30 14:24 ` J. Bruce Fields
2016-11-30 16:56 ` Frank Filz
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=1480228001-64821-12-git-send-email-loghyr@primarydata.com \
--to=loghyr@primarydata.com \
--cc=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/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).