From: Tom Haynes <loghyr@gmail.com>
To: Bruce Fields <bfields@redhat.com>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [pynfs 04/10] flexfiles: Fix up the layout error handling to reflect the previous error
Date: Wed, 16 Dec 2020 16:35:10 -0800 [thread overview]
Message-ID: <20201217003516.75438-5-loghyr@hammerspace.com> (raw)
In-Reply-To: <20201217003516.75438-1-loghyr@hammerspace.com>
When a client reports a layout error, the server has the choice on the next
LAYOUTGET to:
1) Return NFS4_OK
2) Return NFS4ERR_DELAY as it tries to resolve the issue
3) Return the supplied error and let the client/application handle the issue
Signed-off-by: Tom Haynes <loghyr@hammerspace.com>
---
nfs4.1/server41tests/st_flex.py | 147 ++++++++++++++++++++++++++------
1 file changed, 122 insertions(+), 25 deletions(-)
diff --git a/nfs4.1/server41tests/st_flex.py b/nfs4.1/server41tests/st_flex.py
index cbc1166..4defa81 100644
--- a/nfs4.1/server41tests/st_flex.py
+++ b/nfs4.1/server41tests/st_flex.py
@@ -593,8 +593,9 @@ def testFlexLayoutStatsOverflow(t, env):
[15, 407034683097, 0, 0, 0, 0, 0, 0, 0, 10864914432, 0, 10866487296, 93884, 93628, 406154554429, 1131023767183211]]
_LayoutStats(t, env, ls)
-def layoutget_return(sess, fh, open_stateid, layout_iomode=LAYOUTIOMODE4_RW,
- layout_error=None, layout_error_op=OP_WRITE):
+def layoutget_return(sess, fh, open_stateid, allowed_errors=NFS4_OK,
+ layout_iomode=LAYOUTIOMODE4_RW, layout_error=None,
+ layout_error_op=OP_WRITE):
"""
Perform LAYOUTGET and LAYOUTRETURN
"""
@@ -604,7 +605,7 @@ def layoutget_return(sess, fh, open_stateid, layout_iomode=LAYOUTIOMODE4_RW,
op.layoutget(False, LAYOUT4_FLEX_FILES, layout_iomode,
0, NFS4_UINT64_MAX, 4196, open_stateid, 0xffff)]
res = sess.compound(ops)
- check(res)
+ check(res, allowed_errors)
layout_stateid = res.resarray[-1].logr_stateid
# Return layout
@@ -671,10 +672,10 @@ def testFlexLayoutReturnNxioRead(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_READ, NFS4ERR_NXIO, OP_READ)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_READ, NFS4ERR_NXIO, OP_READ)
- # Obtain another layout
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_READ)
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_NXIO], LAYOUTIOMODE4_READ)
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -697,10 +698,10 @@ def testFlexLayoutReturnNxioWrite(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_RW, NFS4ERR_NXIO, OP_WRITE)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW, NFS4ERR_NXIO, OP_WRITE)
- # Obtain another layout
- layoutget_return(sess, fh, open_stateid)
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_NXIO])
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -723,7 +724,10 @@ def testFlexLayoutReturnStaleRead(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_READ, NFS4ERR_STALE, OP_READ)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_READ, NFS4ERR_STALE, OP_READ)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_STALE])
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -746,7 +750,10 @@ def testFlexLayoutReturnStaleWrite(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_RW, NFS4ERR_STALE, OP_WRITE)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW, NFS4ERR_STALE, OP_WRITE)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_STALE])
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -769,7 +776,10 @@ def testFlexLayoutReturnIoRead(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_READ, NFS4ERR_IO, OP_READ)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_READ, NFS4ERR_IO, OP_READ)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_IO])
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -792,7 +802,10 @@ def testFlexLayoutReturnIoWrite(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_RW, NFS4ERR_IO, OP_WRITE)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW, NFS4ERR_IO, OP_WRITE)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_IO])
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -815,7 +828,10 @@ def testFlexLayoutReturnServerFaultRead(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_READ, NFS4ERR_SERVERFAULT, OP_READ)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_READ, NFS4ERR_SERVERFAULT, OP_READ)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_SERVERFAULT])
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -838,15 +854,45 @@ def testFlexLayoutReturnServerFaultWrite(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_RW, NFS4ERR_SERVERFAULT, OP_WRITE)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW, NFS4ERR_SERVERFAULT, OP_WRITE)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_SERVERFAULT])
+
+ # Close file
+ res = close_file(sess, fh, stateid=open_stateid)
+ check(res)
+
+def testFlexLayoutReturnNospcRead(t, env):
+ """
+ Send LAYOUTRETURN with NFS4ERR_NOSPC on READ
+
+ FLAGS: flex layoutreturn
+ CODE: FFLORNOSPC
+ """
+ name = env.testname(t)
+ sess = env.c1.new_pnfs_client_session(env.testname(t))
+
+ # Create the file
+ res = create_file(sess, name)
+ check(res)
+ fh = res.resarray[-1].object
+ open_stateid = res.resarray[-2].stateid
+
+ # Return layout with error
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW, NFS4ERR_NOSPC, OP_WRITE)
+
+ # Verify error code propagation
+ # Unlike with a WRITE, we should see no error
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_READ)
# Close file
res = close_file(sess, fh, stateid=open_stateid)
check(res)
-def testFlexLayoutReturnNospc(t, env):
+def testFlexLayoutReturnNospcWrite(t, env):
"""
- Send LAYOUTRETURN with NFS4ERR_NOSPC
+ Send LAYOUTRETURN with NFS4ERR_NOSPC on WRITE
FLAGS: flex layoutreturn
CODE: FFLORNOSPC
@@ -861,15 +907,45 @@ def testFlexLayoutReturnNospc(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_RW, NFS4ERR_NOSPC, OP_WRITE)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW, NFS4ERR_NOSPC, OP_WRITE)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_NOSPC], LAYOUTIOMODE4_RW)
+
+ # Close file
+ res = close_file(sess, fh, stateid=open_stateid)
+ check(res)
+
+def testFlexLayoutReturnFbigRead(t, env):
+ """
+ Send LAYOUTRETURN with NFS4ERR_FBIG on READ
+
+ FLAGS: flex layoutreturn
+ CODE: FFLORFBIG
+ """
+ name = env.testname(t)
+ sess = env.c1.new_pnfs_client_session(env.testname(t))
+
+ # Create the file
+ res = create_file(sess, name)
+ check(res)
+ fh = res.resarray[-1].object
+ open_stateid = res.resarray[-2].stateid
+
+ # Return layout with error
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW, NFS4ERR_FBIG, OP_WRITE)
+
+ # Verify error code propagation
+ # Unlike with a WRITE, we should see no error
+ layoutget_return(sess, fh, open_stateid, NFS4_OK)
# Close file
res = close_file(sess, fh, stateid=open_stateid)
check(res)
-def testFlexLayoutReturnFbig(t, env):
+def testFlexLayoutReturnFbigWrite(t, env):
"""
- Send LAYOUTRETURN with NFS4ERR_FBIG
+ Send LAYOUTRETURN with NFS4ERR_FBIG on WRITE
FLAGS: flex layoutreturn
CODE: FFLORFBIG
@@ -884,7 +960,10 @@ def testFlexLayoutReturnFbig(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_RW, NFS4ERR_FBIG, OP_WRITE)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW, NFS4ERR_FBIG, OP_WRITE)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_FBIG])
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -907,9 +986,12 @@ def testFlexLayoutReturnAccessRead(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_READ,
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_READ,
NFS4ERR_ACCESS, OP_READ)
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_ACCESS])
+
# Close file
res = close_file(sess, fh, stateid=open_stateid)
check(res)
@@ -931,9 +1013,12 @@ def testFlexLayoutReturnAccessWrite(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_RW,
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW,
NFS4ERR_ACCESS, OP_WRITE)
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, NFS4ERR_ACCESS])
+
# Close file
res = close_file(sess, fh, stateid=open_stateid)
check(res)
@@ -955,7 +1040,10 @@ def testFlexLayoutReturnDelayRead(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_READ, NFS4ERR_DELAY, OP_READ)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_READ, NFS4ERR_DELAY, OP_READ)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY])
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -978,7 +1066,10 @@ def testFlexLayoutReturnDelayWrite(t, env):
open_stateid = res.resarray[-2].stateid
# Return layout with error
- layoutget_return(sess, fh, open_stateid, LAYOUTIOMODE4_RW, NFS4ERR_DELAY, OP_WRITE)
+ layoutget_return(sess, fh, open_stateid, NFS4_OK, LAYOUTIOMODE4_RW, NFS4ERR_DELAY, OP_WRITE)
+
+ # Verify error code propagation
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY])
# Close file
res = close_file(sess, fh, stateid=open_stateid)
@@ -1006,6 +1097,12 @@ def testFlexLayoutReturn1K(t, env):
layout_error = None if i % layout_error_ratio else NFS4ERR_ACCESS
layoutget_return(sess, fh, open_stateid, layout_error=layout_error)
+ # Verify error code propagation
+ if layout_error:
+ layoutget_return(sess, fh, open_stateid, [NFS4_OK, NFS4ERR_DELAY, layout_error])
+ else:
+ layoutget_return(sess, fh, open_stateid, NFS4_OK)
+
# Close file
res = close_file(sess, fh, stateid=open_stateid)
check(res)
--
2.26.2
next prev parent reply other threads:[~2020-12-17 0:36 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 0:35 [pynfs 00/10] Misc Fixes, primarily LAYOUTRETURN Tom Haynes
2020-12-17 0:35 ` [pynfs 01/10] st_flex.py - Added tests for LAYOUTRETURN with errors Tom Haynes
2020-12-17 0:35 ` [pynfs 02/10] st_flex.py - Fixed flag names Tom Haynes
2020-12-17 0:35 ` [pynfs 03/10] Close the file for SEQ10b Tom Haynes
2020-12-18 16:43 ` J. Bruce Fields
2020-12-21 2:42 ` Thomas Haynes
2020-12-21 2:46 ` J. Bruce Fields
2020-12-17 0:35 ` Tom Haynes [this message]
2020-12-17 0:35 ` [pynfs 05/10] Fix testFlexLayoutOldSeqid Tom Haynes
2020-12-17 0:35 ` [pynfs 06/10] st_flex: Reduce the layoutstats period to make tests finish in a sane time Tom Haynes
2020-12-17 0:35 ` [pynfs 07/10] st_flex: Fix up test names Tom Haynes
2020-12-17 0:35 ` [pynfs 08/10] st_flex: Only do 100 layoutget/return in loop Tom Haynes
2020-12-17 0:35 ` [pynfs 09/10] st_flex: We can't return the layout without a layout stateid Tom Haynes
2020-12-17 0:35 ` [pynfs 10/10] st_flex: Fixup check for error in layoutget_return() Tom Haynes
2020-12-18 14:46 ` [pynfs 00/10] Misc Fixes, primarily LAYOUTRETURN J. Bruce Fields
2020-12-18 16:23 ` Mkrtchyan, Tigran
2020-12-18 16:37 ` J. Bruce Fields
2020-12-18 16:38 ` Thomas Haynes
2020-12-18 16:50 ` Mkrtchyan, Tigran
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=20201217003516.75438-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.