xfs: add error tags for log attribute replay test
v3 cover xfs: add error tags for log attribute replay test
Hi all,
These are the corresponding kernel changes for the new log attribute replay test. These are built on top of Allison’s logged attribute patch sets, which can be viewed here:
https://github.com/allisonhenderson/xfs_work/tree/delayed_attrs_v26_extended
This set adds the new error tags da_leaf_split and larp_leaf_to_node, which are used to inject errors in the tests.
v2->v3:
Rename larp_leaf_split to da_leaf_split
Suggestions and feedback are appreciated!
Catherine
Catherine Hoang (2):
xfs: add leaf split error tag
xfs: add leaf to node error tag
fs/xfs/libxfs/xfs_attr_leaf.c | 6 ++++++ fs/xfs/libxfs/xfs_da_btree.c | 4 ++++ fs/xfs/libxfs/xfs_errortag.h | 6 +++++- fs/xfs/xfs_error.c | 6 ++++++ 4 files changed, 21 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
RFC PATCH v3 1/2 xfs: add leaf split error tag
Add an error tag on xfs_da3_split to test log attribute recovery and replay.
--- fs/xfs/libxfs/xfs_da_btree.c | 4 ++++ fs/xfs/libxfs/xfs_errortag.h | 4 +++- fs/xfs/xfs_error.c | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_da_btree.c +4 -0
@@ -22,6 +22,7 @@#include "xfs_trace.h" #include "xfs_buf_item.h" #include "xfs_log.h" +#include "xfs_errortag.h" /* * xfs_da_btree.c
@@ -482,6 +483,9 @@ xfs_da3_split(trace_xfs_da_split (state->args); +if (XFS_TEST_ERROR (false, state->mp,XFS_ERRTAG_DA_LEAF_SPLIT )) +return -EIO ; +/* * Walk back up the tree splitting/inserting/adjusting as necessary. * If we need to insert and there isn't room, split the node, then
fs/xfs/libxfs/xfs_errortag.h +3 -1
@@ -60,7 +60,8 @@#define XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT 37#define XFS_ERRTAG_AG_RESV_FAIL 38#define XFS_ERRTAG_LARP 39 -#define XFS_ERRTAG_MAX 40 +#define XFS_ERRTAG_DA_LEAF_SPLIT 40 +#define XFS_ERRTAG_MAX 41/* * Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
@@ -105,5 +106,6 @@#define XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT 1#define XFS_RANDOM_AG_RESV_FAIL 1#define XFS_RANDOM_LARP 1 +#define XFS_RANDOM_DA_LEAF_SPLIT 1#endif /* __XFS_ERRORTAG_H_ */
fs/xfs/xfs_error.c +3 -0
@@ -58,6 +58,7 @@ static unsigned int xfs_errortag_random_default[] = {XFS_RANDOM_BMAP_ALLOC_MINLEN_EXTENT ,XFS_RANDOM_AG_RESV_FAIL ,XFS_RANDOM_LARP , + XFS_RANDOM_DA_LEAF_SPLIT, }; struct xfs_errortag_attr {
@@ -172,6 +173,7 @@ XFS_ERRORTAG_ATTR_RW(reduce_max_iextents, XFS_ERRTAG_REDUCE_MAX_IEXTENTS);XFS_ERRORTAG_ATTR_RW (bmap_alloc_minlen_extent,XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT );XFS_ERRORTAG_ATTR_RW (ag_resv_fail,XFS_ERRTAG_AG_RESV_FAIL );XFS_ERRORTAG_ATTR_RW (larp,XFS_ERRTAG_LARP ); +XFS_ERRORTAG_ATTR_RW (da_leaf_split,XFS_ERRTAG_DA_LEAF_SPLIT );static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (noerror),
@@ -214,6 +216,7 @@ static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (bmap_alloc_minlen_extent),XFS_ERRORTAG_ATTR_LIST (ag_resv_fail),XFS_ERRORTAG_ATTR_LIST (larp), +XFS_ERRORTAG_ATTR_LIST (da_leaf_split),NULL , };ATTRIBUTE_GROUPS (xfs_errortag);
Signature · 1 line
2.25.1
RFC PATCH v3 2/2 xfs: add leaf to node error tag
In reply to Catherine HoangAdd an error tag on xfs_attr3_leaf_to_node to test log attribute recovery and replay.
--- fs/xfs/libxfs/xfs_attr_leaf.c | 6 ++++++ fs/xfs/libxfs/xfs_errortag.h | 4 +++- fs/xfs/xfs_error.c | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-)
fs/xfs/libxfs/xfs_attr_leaf.c +6 -0
@@ -28,6 +28,7 @@#include "xfs_dir2.h" #include "xfs_log.h" #include "xfs_ag.h" +#include "xfs_errortag.h" /*
@@ -1189,6 +1190,11 @@ xfs_attr3_leaf_to_node(trace_xfs_attr_leaf_to_node (args); +if (XFS_TEST_ERROR (false, mp,XFS_ERRTAG_LARP_LEAF_TO_NODE )) { + error = -EIO ; + goto out; + } + error =xfs_da_grow_inode (args, &blkno);if (error) goto out;
fs/xfs/libxfs/xfs_errortag.h +3 -1
@@ -61,7 +61,8 @@#define XFS_ERRTAG_AG_RESV_FAIL 38#define XFS_ERRTAG_LARP 39#define XFS_ERRTAG_DA_LEAF_SPLIT 40 -#define XFS_ERRTAG_MAX 41 +#define XFS_ERRTAG_LARP_LEAF_TO_NODE 41 +#define XFS_ERRTAG_MAX 42/* * Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
@@ -107,5 +108,6 @@#define XFS_RANDOM_AG_RESV_FAIL 1#define XFS_RANDOM_LARP 1#define XFS_RANDOM_DA_LEAF_SPLIT 1 +#define XFS_RANDOM_LARP_LEAF_TO_NODE 1#endif /* __XFS_ERRORTAG_H_ */
fs/xfs/xfs_error.c +3 -0
@@ -59,6 +59,7 @@ static unsigned int xfs_errortag_random_default[] = {XFS_RANDOM_AG_RESV_FAIL ,XFS_RANDOM_LARP ,XFS_RANDOM_DA_LEAF_SPLIT , + XFS_RANDOM_LARP_LEAF_TO_NODE, }; struct xfs_errortag_attr {
@@ -174,6 +175,7 @@ XFS_ERRORTAG_ATTR_RW(bmap_alloc_minlen_extent, XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTEXFS_ERRORTAG_ATTR_RW (ag_resv_fail,XFS_ERRTAG_AG_RESV_FAIL );XFS_ERRORTAG_ATTR_RW (larp,XFS_ERRTAG_LARP );XFS_ERRORTAG_ATTR_RW (da_leaf_split,XFS_ERRTAG_DA_LEAF_SPLIT ); +XFS_ERRORTAG_ATTR_RW (larp_leaf_to_node,XFS_ERRTAG_LARP_LEAF_TO_NODE );static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (noerror),
@@ -217,6 +219,7 @@ static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (ag_resv_fail),XFS_ERRORTAG_ATTR_LIST (larp),XFS_ERRORTAG_ATTR_LIST (da_leaf_split), +XFS_ERRORTAG_ATTR_LIST (larp_leaf_to_node),NULL , };ATTRIBUTE_GROUPS (xfs_errortag);
Signature · 1 line
2.25.1
Re: [RFC PATCH v3 2/2] xfs: add leaf to node error tag
Quoted 25 lines · Catherine Hoang
Add an error tag on
xfs_attr3_leaf_to_nodeto test log attribute recovery and replay.Signed-off-by Catherine Hoang <[email protected]>Reviewed-by Allison Henderson <[email protected]>Reviewed-by Darrick J. Wong <[email protected]>--- fs/xfs/libxfs/xfs_attr_leaf.c | 6 ++++++ fs/xfs/libxfs/xfs_errortag.h | 4 +++- fs/xfs/xfs_error.c | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-)fs/xfs/libxfs/xfs_attr_leaf.c +1
-0@@ -28,6 +28,7 @@#include "xfs_dir2.h" #include "xfs_log.h" #include "xfs_ag.h" +#include "xfs_errortag.h" /*
fs/xfs/libxfs/xfs_attr_leaf.c xfs_attr3_leaf_to_node( · line 1193
Quoted 4 lines
fs/xfs/libxfs/xfs_attr_leaf.c +1
-0@@ -1189,6 +1190,11 @@ xfs_attr3_leaf_to_node(trace_xfs_attr_leaf_to_node (args); +if (XFS_TEST_ERROR (false, mp,XFS_ERRTAG_LARP_LEAF_TO_NODE )) {
Sorry for the long trickle of random post-review comments, but ...
This error injection knob isn't specifically tied to LARP mode, right?
i.e. one can trigger it on /any/ expansion of an xattr data structure from leaf to node format, right? Even if LARP isn't enabled?
Can this be renamed to XFS_ERRTAG_ATTR_LEAF_TO_NODE, please? You can keep the RVB tag. :)
--D
Quoted 59 lines
fs/xfs/libxfs/xfs_attr_leaf.c +4
-0+ error = -EIO ; + goto out; + } + error =xfs_da_grow_inode (args, &blkno);if (error) goto out;fs/xfs/libxfs/xfs_errortag.h +3
-1@@ -61,7 +61,8 @@#define XFS_ERRTAG_AG_RESV_FAIL 38#define XFS_ERRTAG_LARP 39#define XFS_ERRTAG_DA_LEAF_SPLIT 40 -#define XFS_ERRTAG_MAX 41 +#define XFS_ERRTAG_LARP_LEAF_TO_NODE 41 +#define XFS_ERRTAG_MAX 42/* * Random factors for above tags, 1 means always, 2 means 1/2 time, etc. @@ -107,5 +108,6 @@#define XFS_RANDOM_AG_RESV_FAIL 1#define XFS_RANDOM_LARP 1#define XFS_RANDOM_DA_LEAF_SPLIT 1 +#define XFS_RANDOM_LARP_LEAF_TO_NODE 1#endif /* __XFS_ERRORTAG_H_ */ fs/xfs/xfs_error.c +3
-0@@ -59,6 +59,7 @@ static unsigned int xfs_errortag_random_default[] = {XFS_RANDOM_AG_RESV_FAIL ,XFS_RANDOM_LARP ,XFS_RANDOM_DA_LEAF_SPLIT , + XFS_RANDOM_LARP_LEAF_TO_NODE, }; struct xfs_errortag_attr {@@ -174,6 +175,7 @@ XFS_ERRORTAG_ATTR_RW(bmap_alloc_minlen_extent, XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTEXFS_ERRORTAG_ATTR_RW (ag_resv_fail,XFS_ERRTAG_AG_RESV_FAIL );XFS_ERRORTAG_ATTR_RW (larp,XFS_ERRTAG_LARP );XFS_ERRORTAG_ATTR_RW (da_leaf_split,XFS_ERRTAG_DA_LEAF_SPLIT ); +XFS_ERRORTAG_ATTR_RW (larp_leaf_to_node,XFS_ERRTAG_LARP_LEAF_TO_NODE );static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (noerror),@@ -217,6 +219,7 @@ static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (ag_resv_fail),XFS_ERRORTAG_ATTR_LIST (larp),XFS_ERRORTAG_ATTR_LIST (da_leaf_split), +XFS_ERRORTAG_ATTR_LIST (larp_leaf_to_node),NULL , };ATTRIBUTE_GROUPS (xfs_errortag);Signature · 1 line
2.25.1