xfsprogs: add error tags for log attribute replay test
v2 cover xfsprogs: add error tags for log attribute replay test
Hi all,
Just wanted to get this sent out again after the holidays. Original text below:
These are the corresponding userspace 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_xfsprogs_v25_extended
This set adds the new error tags larp_leaf_split and larp_leaf_to_node, which are used to inject errors in the tests.
v2 changes:
Updated naming scheme to make it clear that these error tags are meant to trigger on the attribute code path for a replay
Suggestions and feedback are appreciated!
Catherine
Catherine Hoang (2):
xfsprogs: add leaf split error tag
xfsprogs: add leaf to node error tag
io/inject.c | 2 ++ libxfs/xfs_attr_leaf.c | 5 +++++ libxfs/xfs_da_btree.c | 4 ++++ libxfs/xfs_errortag.h | 6 +++++- 4 files changed, 16 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
RFC PATCH v2 1/2 xfsprogs: add leaf split error tag
Add an error tag on xfs_da3_split to test log attribute recovery and replay.
--- io/inject.c | 1 + libxfs/xfs_da_btree.c | 4 ++++ libxfs/xfs_errortag.h | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-)
io/inject.c +1 -0
@@ -59,6 +59,7 @@ error_tag(char *name) { XFS_ERRTAG_BMAP_ALLOC_MINLEN_EXTENT, "bmap_alloc_minlen_extent" }, { XFS_ERRTAG_AG_RESV_FAIL, "ag_resv_fail" }, { XFS_ERRTAG_LARP, "larp" }, + { XFS_ERRTAG_LARP_LEAF_SPLIT, "larp_leaf_split" }, { XFS_ERRTAG_MAX, NULL } };int count;
libxfs/xfs_da_btree.c +4 -0
@@ -479,6 +479,10 @@ xfs_da3_split(trace_xfs_da_split (state->args); +if (XFS_TEST_ERROR (false, state->mp,XFS_ERRTAG_LARP_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
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_LARP_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_LARP_LEAF_SPLIT 1#endif /* __XFS_ERRORTAG_H_ */
Signature · 1 line
2.25.1
RFC PATCH v2 2/2 xfsprogs: 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.
--- io/inject.c | 1 + libxfs/xfs_attr_leaf.c | 5 +++++ libxfs/xfs_errortag.h | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-)
io/inject.c +1 -0
@@ -60,6 +60,7 @@ error_tag(char *name) { XFS_ERRTAG_AG_RESV_FAIL, "ag_resv_fail" }, { XFS_ERRTAG_LARP, "larp" }, { XFS_ERRTAG_LARP_LEAF_SPLIT, "larp_leaf_split" }, + { XFS_ERRTAG_LARP_LEAF_TO_NODE, "larp_leaf_to_node" }, { XFS_ERRTAG_MAX, NULL } };int count;
libxfs/xfs_attr_leaf.c +5 -0
@@ -1181,6 +1181,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;
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_LARP_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_LARP_LEAF_SPLIT 1 +#define XFS_RANDOM_LARP_LEAF_TO_NODE 1#endif /* __XFS_ERRORTAG_H_ */
Signature · 1 line
2.25.1