From: Tom Haynes <loghyr@gmail.com>
To: Bruce Fields <bfields@redhat.com>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [pynfs python3 3/7] st_flex: Provide an empty ff_layoutreturn4 by default for LAYOUTRETURN
Date: Sat, 19 Dec 2020 10:29:44 -0800 [thread overview]
Message-ID: <20201219182948.83000-4-loghyr@hammerspace.com> (raw)
In-Reply-To: <20201219182948.83000-1-loghyr@hammerspace.com>
From: Tom Haynes <loghyr@excfb.com>
Signed-off-by: Tom Haynes <loghyr@excfb.com>
---
nfs4.1/server41tests/st_flex.py | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/nfs4.1/server41tests/st_flex.py b/nfs4.1/server41tests/st_flex.py
index 8150054..7036271 100644
--- a/nfs4.1/server41tests/st_flex.py
+++ b/nfs4.1/server41tests/st_flex.py
@@ -10,6 +10,11 @@ from nfs4lib import FancyNFS4Packer, get_nfstime
current_stateid = stateid4(1, '\0' * 12)
+empty_fflr = ff_layoutreturn4([], [])
+
+empty_p = FlexPacker()
+empty_p.pack_ff_layoutreturn4(empty_fflr)
+
def check_seqid(stateid, seqid):
if stateid.seqid != seqid:
fail("Expected stateid.seqid==%i, got %i" % (seqid, stateid.seqid))
@@ -103,10 +108,12 @@ def testFlexLayoutReturnFile(t, env):
check(res)
# Return layout
layout_stateid = res.resarray[-1].logr_stateid
+
ops = [op.putfh(fh),
op.layoutreturn(False, LAYOUT4_FLEX_FILES, LAYOUTIOMODE4_ANY,
layoutreturn4(LAYOUTRETURN4_FILE,
- layoutreturn_file4(0, NFS4_MAXFILELEN, layout_stateid, "")))]
+ layoutreturn_file4(0, NFS4_MAXFILELEN,
+ layout_stateid, empty_p.get_buffer())))]
res = sess.compound(ops)
check(res)
res = close_file(sess, fh, stateid=open_stateid)
@@ -167,7 +174,8 @@ def testFlexLayoutOldSeqid(t, env):
ops = [op.putfh(fh),
op.layoutreturn(False, LAYOUT4_FLEX_FILES, LAYOUTIOMODE4_ANY,
layoutreturn4(LAYOUTRETURN4_FILE,
- layoutreturn_file4(0, NFS4_MAXFILELEN, lo_stateid, "")))]
+ layoutreturn_file4(0, NFS4_MAXFILELEN,
+ lo_stateid, empty_p.get_buffer())))]
res = sess.compound(ops)
check(res, NFS4ERR_OLD_STATEID, "LAYOUTRETURN with an old stateid")
res = close_file(sess, fh, stateid=open_stateid)
@@ -203,7 +211,8 @@ def testFlexLayoutStress(t, env):
ops = [op.putfh(fh),
op.layoutreturn(False, LAYOUT4_FLEX_FILES, LAYOUTIOMODE4_ANY,
layoutreturn4(LAYOUTRETURN4_FILE,
- layoutreturn_file4(0, NFS4_MAXFILELEN, lo_stateid, "")))]
+ layoutreturn_file4(0, NFS4_MAXFILELEN,
+ lo_stateid, empty_p.get_buffer())))]
res = sess.compound(ops)
check(res)
res = close_file(sess, fh, stateid=open_stateid)
@@ -251,7 +260,8 @@ def testFlexGetDevInfo(t, env):
ops = [op.putfh(fh),
op.layoutreturn(False, LAYOUT4_FLEX_FILES, LAYOUTIOMODE4_ANY,
layoutreturn4(LAYOUTRETURN4_FILE,
- layoutreturn_file4(0, NFS4_MAXFILELEN, lo_stateid, "")))]
+ layoutreturn_file4(0, NFS4_MAXFILELEN,
+ lo_stateid, empty_p.get_buffer())))]
res = sess.compound(ops)
check(res)
res = close_file(sess, fh, stateid=open_stateid)
@@ -395,7 +405,8 @@ def testFlexLayoutStatsSmall(t, env):
ops = [op.putfh(fh),
op.layoutreturn(False, LAYOUT4_FLEX_FILES, LAYOUTIOMODE4_ANY,
layoutreturn4(LAYOUTRETURN4_FILE,
- layoutreturn_file4(0, NFS4_MAXFILELEN, lo_stateid, p.get_buffer()))),
+ layoutreturn_file4(0, NFS4_MAXFILELEN,
+ lo_stateid, p.get_buffer()))),
op.close(0, open_stateid)]
res = sess.compound(ops)
check(res)
@@ -492,7 +503,8 @@ def _LayoutStats(t, env, stats):
ops = [op.putfh(fh),
op.layoutreturn(False, LAYOUT4_FLEX_FILES, LAYOUTIOMODE4_ANY,
layoutreturn4(LAYOUTRETURN4_FILE,
- layoutreturn_file4(0, NFS4_MAXFILELEN, lo_stateid, "")))]
+ layoutreturn_file4(0, NFS4_MAXFILELEN,
+ lo_stateid, empty_p.get_buffer())))]
res = sess.compound(ops)
check(res)
res = close_file(sess, fh, stateid=open_stateid)
@@ -615,7 +627,7 @@ def layoutget_return(sess, fh, open_stateid, allowed_errors=NFS4_OK,
op.layoutreturn(False, LAYOUT4_FLEX_FILES, LAYOUTIOMODE4_ANY,
layoutreturn4(LAYOUTRETURN4_FILE,
layoutreturn_file4(0, NFS4_MAXFILELEN,
- layout_stateid, "")))]
+ layout_stateid, empty_p.get_buffer())))]
else: # Return layout with error
# Get device id
locb = res.resarray[-1].logr_layout[0].lo_content.loc_body
--
2.26.2
next prev parent reply other threads:[~2020-12-19 18:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 18:29 [pynfs python3 0/7] Python3 patches for st_flex.py Tom Haynes
2020-12-19 18:29 ` [pynfs python3 1/7] CB_LAYOUTRECALL: Make string a byte array Tom Haynes
2020-12-19 18:29 ` [pynfs python3 2/7] st_flex: Use NFS4_MAXFILELEN in layout calls Tom Haynes
2020-12-19 18:29 ` Tom Haynes [this message]
2020-12-19 18:29 ` [pynfs python3 4/7] st_flex: Use range instead of xrange for python3 Tom Haynes
2020-12-19 18:29 ` [pynfs python3 5/7] st_flex: Test is now redundant Tom Haynes
2020-12-19 18:29 ` [pynfs python3 6/7] st_flex: Return the layout before closing the file Tom Haynes
2020-12-20 15:56 ` Mkrtchyan, Tigran
2020-12-19 18:29 ` [pynfs python3 7/7] st_flex: testFlexLayoutStatsSmall needed loving to pass python3 Tom Haynes
2020-12-21 20:00 ` [pynfs python3 0/7] Python3 patches for st_flex.py J. Bruce Fields
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=20201219182948.83000-4-loghyr@hammerspace.com \
--to=loghyr@gmail.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