* [PATCH v2] xfs: test xfsdump subtree restores
@ 2026-07-23 6:26 Donald Douwsma
2026-07-28 3:25 ` Christoph Hellwig
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Donald Douwsma @ 2026-07-23 6:26 UTC (permalink / raw)
To: linux-xfs, fstests; +Cc: Donald Douwsma
Regression test for cumulative restores where a directory has been
renamed outside of the subtree being restored triggering the assert:
xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed
Signed-off-by: Donald Douwsma <ddouwsma@redhat.com>
---
Changes since v1
- Fix use of _do, including label quoting
- Update test output
- Add tests for additional edge cases
---
tests/xfs/995 | 58 +++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/995.out | 8 +++++++
2 files changed, 66 insertions(+)
create mode 100755 tests/xfs/995
create mode 100644 tests/xfs/995.out
diff --git a/tests/xfs/995 b/tests/xfs/995
new file mode 100755
index 000000000..bba0bcd52
--- /dev/null
+++ b/tests/xfs/995
@@ -0,0 +1,58 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2026 Red Hat. All Rights Reserved.
+#
+# FS QA Test 995
+#
+# Regression test for cumulative restores where a directory has been
+# renamed outside of the subtree being restored resulting in
+#
+# xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed
+#
+. ./common/preamble
+_begin_fstest auto dump
+_do_die_on_error="always"
+
+_fixed_by_git_commit xfsdump dd63de5 \
+ "xfsrestore: only process subtrees that are selected"
+
+# Override the default cleanup function.
+_cleanup()
+{
+ _cleanup_dump
+ cd /
+ rm -r -f $tmp.*
+}
+
+# Import common functions.
+. ./common/dump
+
+# Modify as appropriate.
+_require_scratch
+_scratch_mkfs_xfs >>$seqres.full
+_scratch_mount
+
+mkdir -p $SCRATCH_MNT/a/b/c/d/e/f/g
+mkdir -p $SCRATCH_MNT/restore_me/B/C/D/E/F/G
+
+_do "Creating l0 dump" "$XFSDUMP_PROG -L lab_l0 -M test -l0 -f $tmp.dump.l0 $SCRATCH_MNT"
+
+mv $SCRATCH_MNT/a/b/c $SCRATCH_MNT/1
+
+_do "Creating l2 dump" "$XFSDUMP_PROG -L lab_l2.0 -M test -l2 -f $tmp.dump.l2.0 $SCRATCH_MNT"
+
+dir=$(mktemp -d $SCRATCH_MNT/restore_XXX)
+_do "Cumulative restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r $dir"
+_do "Cumulative restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir"
+
+dir=$(mktemp -d $SCRATCH_MNT/restore_XXX)
+_do "Cumulative subtree restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r -s restore_me $dir"
+# The next command core dumps prior to xfsdump v3.3.0 when noref_elim_recurse attempts to
+# rename directories outside of the subtree when their parent has not been created.
+_do "Cumulative subtree restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir"
+
+dir=$(mktemp -d $SCRATCH_MNT/restore_XXX)
+_do "Restore l2 on its own" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r -s restore_me $dir"
+
+# success, all done
+_exit 0
diff --git a/tests/xfs/995.out b/tests/xfs/995.out
new file mode 100644
index 000000000..9a620eb31
--- /dev/null
+++ b/tests/xfs/995.out
@@ -0,0 +1,8 @@
+QA output created by 995
+Creating l0 dump... done
+Creating l2 dump... done
+Cumulative restore l0... done
+Cumulative restore l2... done
+Cumulative subtree restore l0... done
+Cumulative subtree restore l2... done
+Restore l2 on its own... done
--
2.52.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2] xfs: test xfsdump subtree restores 2026-07-23 6:26 [PATCH v2] xfs: test xfsdump subtree restores Donald Douwsma @ 2026-07-28 3:25 ` Christoph Hellwig 2026-07-28 10:34 ` Zorro Lang 2026-07-28 10:29 ` Zorro Lang 2026-07-28 10:39 ` Zorro Lang 2 siblings, 1 reply; 8+ messages in thread From: Christoph Hellwig @ 2026-07-28 3:25 UTC (permalink / raw) To: Donald Douwsma; +Cc: linux-xfs, fstests On Thu, Jul 23, 2026 at 04:26:17PM +1000, Donald Douwsma wrote: > + > +_do "Creating l2 dump" "$XFSDUMP_PROG -L lab_l2.0 -M test -l2 -f $tmp.dump.l2.0 $SCRATCH_MNT" > + > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > +_do "Cumulative restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r $dir" > +_do "Cumulative restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir" > + > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > +_do "Cumulative subtree restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r -s restore_me $dir" > +# The next command core dumps prior to xfsdump v3.3.0 when noref_elim_recurse attempts to > +# rename directories outside of the subtree when their parent has not been created. > +_do "Cumulative subtree restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir" Maybe break these lines up with \ after the description to make it a bit more readable? Otherwise looks good: Reviewed-by: Christoph Hellwig <hch@lst.de> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] xfs: test xfsdump subtree restores 2026-07-28 3:25 ` Christoph Hellwig @ 2026-07-28 10:34 ` Zorro Lang 0 siblings, 0 replies; 8+ messages in thread From: Zorro Lang @ 2026-07-28 10:34 UTC (permalink / raw) To: Christoph Hellwig; +Cc: Donald Douwsma, linux-xfs, fstests On Mon, Jul 27, 2026 at 08:25:26PM -0700, Christoph Hellwig wrote: > On Thu, Jul 23, 2026 at 04:26:17PM +1000, Donald Douwsma wrote: > > + > > +_do "Creating l2 dump" "$XFSDUMP_PROG -L lab_l2.0 -M test -l2 -f $tmp.dump.l2.0 $SCRATCH_MNT" > > + > > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > > +_do "Cumulative restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r $dir" > > +_do "Cumulative restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir" > > + > > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > > +_do "Cumulative subtree restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r -s restore_me $dir" > > +# The next command core dumps prior to xfsdump v3.3.0 when noref_elim_recurse attempts to > > +# rename directories outside of the subtree when their parent has not been created. > > +_do "Cumulative subtree restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir" > > Maybe break these lines up with \ after the description to make > it a bit more readable? Sure, I'll help to do this change when I merge it. Thanks Christoph! > > Otherwise looks good: > > Reviewed-by: Christoph Hellwig <hch@lst.de> > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] xfs: test xfsdump subtree restores 2026-07-23 6:26 [PATCH v2] xfs: test xfsdump subtree restores Donald Douwsma 2026-07-28 3:25 ` Christoph Hellwig @ 2026-07-28 10:29 ` Zorro Lang 2026-07-28 10:39 ` Zorro Lang 2 siblings, 0 replies; 8+ messages in thread From: Zorro Lang @ 2026-07-28 10:29 UTC (permalink / raw) To: Donald Douwsma; +Cc: linux-xfs, fstests On Thu, Jul 23, 2026 at 04:26:17PM +1000, Donald Douwsma wrote: > Regression test for cumulative restores where a directory has been > renamed outside of the subtree being restored triggering the assert: > > xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed > > Signed-off-by: Donald Douwsma <ddouwsma@redhat.com> > --- > Changes since v1 > - Fix use of _do, including label quoting > - Update test output > - Add tests for additional edge cases Hi Donald, This version is good to me now. Reviewed-by: Zorro Lang <zlang@kernel.org> > --- > tests/xfs/995 | 58 +++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/995.out | 8 +++++++ > 2 files changed, 66 insertions(+) > create mode 100755 tests/xfs/995 > create mode 100644 tests/xfs/995.out > > diff --git a/tests/xfs/995 b/tests/xfs/995 > new file mode 100755 > index 000000000..bba0bcd52 > --- /dev/null > +++ b/tests/xfs/995 > @@ -0,0 +1,58 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2026 Red Hat. All Rights Reserved. > +# > +# FS QA Test 995 > +# > +# Regression test for cumulative restores where a directory has been > +# renamed outside of the subtree being restored resulting in > +# > +# xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed > +# > +. ./common/preamble > +_begin_fstest auto dump > +_do_die_on_error="always" > + > +_fixed_by_git_commit xfsdump dd63de5 \ > + "xfsrestore: only process subtrees that are selected" > + > +# Override the default cleanup function. > +_cleanup() > +{ > + _cleanup_dump > + cd / > + rm -r -f $tmp.* > +} > + > +# Import common functions. > +. ./common/dump > + > +# Modify as appropriate. > +_require_scratch > +_scratch_mkfs_xfs >>$seqres.full > +_scratch_mount > + > +mkdir -p $SCRATCH_MNT/a/b/c/d/e/f/g > +mkdir -p $SCRATCH_MNT/restore_me/B/C/D/E/F/G > + > +_do "Creating l0 dump" "$XFSDUMP_PROG -L lab_l0 -M test -l0 -f $tmp.dump.l0 $SCRATCH_MNT" > + > +mv $SCRATCH_MNT/a/b/c $SCRATCH_MNT/1 > + > +_do "Creating l2 dump" "$XFSDUMP_PROG -L lab_l2.0 -M test -l2 -f $tmp.dump.l2.0 $SCRATCH_MNT" > + > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > +_do "Cumulative restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r $dir" > +_do "Cumulative restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir" > + > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > +_do "Cumulative subtree restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r -s restore_me $dir" > +# The next command core dumps prior to xfsdump v3.3.0 when noref_elim_recurse attempts to > +# rename directories outside of the subtree when their parent has not been created. > +_do "Cumulative subtree restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir" > + > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > +_do "Restore l2 on its own" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r -s restore_me $dir" > + > +# success, all done > +_exit 0 > diff --git a/tests/xfs/995.out b/tests/xfs/995.out > new file mode 100644 > index 000000000..9a620eb31 > --- /dev/null > +++ b/tests/xfs/995.out > @@ -0,0 +1,8 @@ > +QA output created by 995 > +Creating l0 dump... done > +Creating l2 dump... done > +Cumulative restore l0... done > +Cumulative restore l2... done > +Cumulative subtree restore l0... done > +Cumulative subtree restore l2... done > +Restore l2 on its own... done > -- > 2.52.0 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] xfs: test xfsdump subtree restores 2026-07-23 6:26 [PATCH v2] xfs: test xfsdump subtree restores Donald Douwsma 2026-07-28 3:25 ` Christoph Hellwig 2026-07-28 10:29 ` Zorro Lang @ 2026-07-28 10:39 ` Zorro Lang 2026-08-07 7:48 ` Donald Douwsma 2 siblings, 1 reply; 8+ messages in thread From: Zorro Lang @ 2026-07-28 10:39 UTC (permalink / raw) To: Donald Douwsma; +Cc: linux-xfs, fstests On Thu, Jul 23, 2026 at 04:26:17PM +1000, Donald Douwsma wrote: > Regression test for cumulative restores where a directory has been > renamed outside of the subtree being restored triggering the assert: > > xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed > > Signed-off-by: Donald Douwsma <ddouwsma@redhat.com> > --- > Changes since v1 > - Fix use of _do, including label quoting > - Update test output > - Add tests for additional edge cases > --- > tests/xfs/995 | 58 +++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/995.out | 8 +++++++ > 2 files changed, 66 insertions(+) > create mode 100755 tests/xfs/995 > create mode 100644 tests/xfs/995.out > > diff --git a/tests/xfs/995 b/tests/xfs/995 > new file mode 100755 > index 000000000..bba0bcd52 > --- /dev/null > +++ b/tests/xfs/995 > @@ -0,0 +1,58 @@ > +#! /bin/bash > +# SPDX-License-Identifier: GPL-2.0 > +# Copyright (c) 2026 Red Hat. All Rights Reserved. > +# > +# FS QA Test 995 > +# > +# Regression test for cumulative restores where a directory has been > +# renamed outside of the subtree being restored resulting in > +# > +# xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed > +# > +. ./common/preamble > +_begin_fstest auto dump > +_do_die_on_error="always" I think this line is useless now, right? I'll remove it. > + > +_fixed_by_git_commit xfsdump dd63de5 \ > + "xfsrestore: only process subtrees that are selected" > + > +# Override the default cleanup function. > +_cleanup() > +{ > + _cleanup_dump > + cd / > + rm -r -f $tmp.* > +} > + > +# Import common functions. > +. ./common/dump > + > +# Modify as appropriate. > +_require_scratch > +_scratch_mkfs_xfs >>$seqres.full > +_scratch_mount > + > +mkdir -p $SCRATCH_MNT/a/b/c/d/e/f/g > +mkdir -p $SCRATCH_MNT/restore_me/B/C/D/E/F/G > + > +_do "Creating l0 dump" "$XFSDUMP_PROG -L lab_l0 -M test -l0 -f $tmp.dump.l0 $SCRATCH_MNT" > + > +mv $SCRATCH_MNT/a/b/c $SCRATCH_MNT/1 > + > +_do "Creating l2 dump" "$XFSDUMP_PROG -L lab_l2.0 -M test -l2 -f $tmp.dump.l2.0 $SCRATCH_MNT" > + > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > +_do "Cumulative restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r $dir" > +_do "Cumulative restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir" > + > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > +_do "Cumulative subtree restore l0" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r -s restore_me $dir" > +# The next command core dumps prior to xfsdump v3.3.0 when noref_elim_recurse attempts to > +# rename directories outside of the subtree when their parent has not been created. > +_do "Cumulative subtree restore l2" "$XFSRESTORE_PROG -f $tmp.dump.l2.0 -r $dir" > + > +dir=$(mktemp -d $SCRATCH_MNT/restore_XXX) > +_do "Restore l2 on its own" "$XFSRESTORE_PROG -f $tmp.dump.l0 -r -s restore_me $dir" > + > +# success, all done > +_exit 0 > diff --git a/tests/xfs/995.out b/tests/xfs/995.out > new file mode 100644 > index 000000000..9a620eb31 > --- /dev/null > +++ b/tests/xfs/995.out > @@ -0,0 +1,8 @@ > +QA output created by 995 > +Creating l0 dump... done > +Creating l2 dump... done > +Cumulative restore l0... done > +Cumulative restore l2... done > +Cumulative subtree restore l0... done > +Cumulative subtree restore l2... done > +Restore l2 on its own... done > -- > 2.52.0 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] xfs: test xfsdump subtree restores 2026-07-28 10:39 ` Zorro Lang @ 2026-08-07 7:48 ` Donald Douwsma 2026-08-10 20:12 ` Zorro Lang 0 siblings, 1 reply; 8+ messages in thread From: Donald Douwsma @ 2026-08-07 7:48 UTC (permalink / raw) To: linux-xfs, fstests On 28/7/26 20:39, Zorro Lang wrote: > On Thu, Jul 23, 2026 at 04:26:17PM +1000, Donald Douwsma wrote: >> Regression test for cumulative restores where a directory has been >> renamed outside of the subtree being restored triggering the assert: >> >> xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed >> >> Signed-off-by: Donald Douwsma <ddouwsma@redhat.com> >> --- >> Changes since v1 >> - Fix use of _do, including label quoting >> - Update test output >> - Add tests for additional edge cases >> --- >> tests/xfs/995 | 58 +++++++++++++++++++++++++++++++++++++++++++++++ >> tests/xfs/995.out | 8 +++++++ >> 2 files changed, 66 insertions(+) >> create mode 100755 tests/xfs/995 >> create mode 100644 tests/xfs/995.out >> >> diff --git a/tests/xfs/995 b/tests/xfs/995 >> new file mode 100755 >> index 000000000..bba0bcd52 >> --- /dev/null >> +++ b/tests/xfs/995 >> @@ -0,0 +1,58 @@ >> +#! /bin/bash >> +# SPDX-License-Identifier: GPL-2.0 >> +# Copyright (c) 2026 Red Hat. All Rights Reserved. >> +# >> +# FS QA Test 995 >> +# >> +# Regression test for cumulative restores where a directory has been >> +# renamed outside of the subtree being restored resulting in >> +# >> +# xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed >> +# >> +. ./common/preamble >> +_begin_fstest auto dump >> +_do_die_on_error="always" > > I think this line is useless now, right? I'll remove it. > Yes, thanks. I did have a general question about how _do_die_on_error is used $ git grep _do_die_on_error common/rc:# second argument. If the command fails and the variable _do_die_on_error common/rc:# is set to "always" or the two argument form is used and _do_die_on_error common/rc: && [ "$_do_die_on_error" = "always" \ common/rc: -o \( $# -eq 2 -a "$_do_die_on_error" = "message_only" \) ] tests/generic/017:_do_die_on_error=y tests/generic/053:_do_die_on_error=y tests/xfs/041:_do_die_on_error=message_only tests/xfs/042:_do_die_on_error=message_only tests/xfs/596:_do_die_on_error=message_only tests/xfs/635:_do_die_on_error=message_only _do_die_on_error=y doesn't seem valid. generic/017 doesn't use _do, and I think generic/053 wants _do_die_on_error=always Thoughts? Don ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] xfs: test xfsdump subtree restores 2026-08-07 7:48 ` Donald Douwsma @ 2026-08-10 20:12 ` Zorro Lang 2026-08-11 9:37 ` Donald Douwsma 0 siblings, 1 reply; 8+ messages in thread From: Zorro Lang @ 2026-08-10 20:12 UTC (permalink / raw) To: Donald Douwsma; +Cc: linux-xfs, fstests On Fri, Aug 07, 2026 at 05:48:57PM +1000, Donald Douwsma wrote: > On 28/7/26 20:39, Zorro Lang wrote: > > On Thu, Jul 23, 2026 at 04:26:17PM +1000, Donald Douwsma wrote: > >> Regression test for cumulative restores where a directory has been > >> renamed outside of the subtree being restored triggering the assert: > >> > >> xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed > >> > >> Signed-off-by: Donald Douwsma <ddouwsma@redhat.com> > >> --- > >> Changes since v1 > >> - Fix use of _do, including label quoting > >> - Update test output > >> - Add tests for additional edge cases > >> --- > >> tests/xfs/995 | 58 +++++++++++++++++++++++++++++++++++++++++++++++ > >> tests/xfs/995.out | 8 +++++++ > >> 2 files changed, 66 insertions(+) > >> create mode 100755 tests/xfs/995 > >> create mode 100644 tests/xfs/995.out > >> > >> diff --git a/tests/xfs/995 b/tests/xfs/995 > >> new file mode 100755 > >> index 000000000..bba0bcd52 > >> --- /dev/null > >> +++ b/tests/xfs/995 > >> @@ -0,0 +1,58 @@ > >> +#! /bin/bash > >> +# SPDX-License-Identifier: GPL-2.0 > >> +# Copyright (c) 2026 Red Hat. All Rights Reserved. > >> +# > >> +# FS QA Test 995 > >> +# > >> +# Regression test for cumulative restores where a directory has been > >> +# renamed outside of the subtree being restored resulting in > >> +# > >> +# xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed > >> +# > >> +. ./common/preamble > >> +_begin_fstest auto dump > >> +_do_die_on_error="always" > > > > I think this line is useless now, right? I'll remove it. > > > > Yes, thanks. > > I did have a general question about how _do_die_on_error is used > > $ git grep _do_die_on_error > common/rc:# second argument. If the command fails and the variable _do_die_on_error > common/rc:# is set to "always" or the two argument form is used and _do_die_on_error > common/rc: && [ "$_do_die_on_error" = "always" \ > common/rc: -o \( $# -eq 2 -a "$_do_die_on_error" = "message_only" \) ] Oh, my bad. I confused this parameter with the "enable_error" parameter you tried to introduce in your previous patch. Since this variable is used by the current _do helper, setting it to "always" or "message_only" here is good. I will keep this line. > tests/generic/017:_do_die_on_error=y > tests/generic/053:_do_die_on_error=y > tests/xfs/041:_do_die_on_error=message_only > tests/xfs/042:_do_die_on_error=message_only > tests/xfs/596:_do_die_on_error=message_only > tests/xfs/635:_do_die_on_error=message_only > > _do_die_on_error=y doesn't seem valid. I think you're right, "y" isn't valid. The _do() helper is quite old and rarely used. If you have any optimization suggestions, feel free to send a patch to improve it. For this patch, I'll merge your current version directly. Thanks, Zorro > > generic/017 doesn't use _do, and I think generic/053 wants _do_die_on_error=always > > Thoughts? > > Don > > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] xfs: test xfsdump subtree restores 2026-08-10 20:12 ` Zorro Lang @ 2026-08-11 9:37 ` Donald Douwsma 0 siblings, 0 replies; 8+ messages in thread From: Donald Douwsma @ 2026-08-11 9:37 UTC (permalink / raw) To: linux-xfs, fstests On 11/8/26 06:12, Zorro Lang wrote: > On Fri, Aug 07, 2026 at 05:48:57PM +1000, Donald Douwsma wrote: >> On 28/7/26 20:39, Zorro Lang wrote: >>> On Thu, Jul 23, 2026 at 04:26:17PM +1000, Donald Douwsma wrote: >>>> Regression test for cumulative restores where a directory has been >>>> renamed outside of the subtree being restored triggering the assert: >>>> >>>> xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed >>>> >>>> Signed-off-by: Donald Douwsma <ddouwsma@redhat.com> >>>> --- >>>> Changes since v1 >>>> - Fix use of _do, including label quoting >>>> - Update test output >>>> - Add tests for additional edge cases >>>> --- >>>> tests/xfs/995 | 58 +++++++++++++++++++++++++++++++++++++++++++++++ >>>> tests/xfs/995.out | 8 +++++++ >>>> 2 files changed, 66 insertions(+) >>>> create mode 100755 tests/xfs/995 >>>> create mode 100644 tests/xfs/995.out >>>> >>>> diff --git a/tests/xfs/995 b/tests/xfs/995 >>>> new file mode 100755 >>>> index 000000000..bba0bcd52 >>>> --- /dev/null >>>> +++ b/tests/xfs/995 >>>> @@ -0,0 +1,58 @@ >>>> +#! /bin/bash >>>> +# SPDX-License-Identifier: GPL-2.0 >>>> +# Copyright (c) 2026 Red Hat. All Rights Reserved. >>>> +# >>>> +# FS QA Test 995 >>>> +# >>>> +# Regression test for cumulative restores where a directory has been >>>> +# renamed outside of the subtree being restored resulting in >>>> +# >>>> +# xfsrestore: tree.c:1421: noref_elim_recurse: Assertion 'isrealpr' failed >>>> +# >>>> +. ./common/preamble >>>> +_begin_fstest auto dump >>>> +_do_die_on_error="always" >>> >>> I think this line is useless now, right? I'll remove it. >>> >> >> Yes, thanks. >> >> I did have a general question about how _do_die_on_error is used >> >> $ git grep _do_die_on_error >> common/rc:# second argument. If the command fails and the variable _do_die_on_error >> common/rc:# is set to "always" or the two argument form is used and _do_die_on_error >> common/rc: && [ "$_do_die_on_error" = "always" \ >> common/rc: -o \( $# -eq 2 -a "$_do_die_on_error" = "message_only" \) ] > > Oh, my bad. I confused this parameter with the "enable_error" parameter you > tried to introduce in your previous patch. You mean the attr one that ended up as tests/xfs/649" lol, no. Though that was helpful when creating/debugging a test that panics a box. > Since this variable is used by the current _do helper, setting it to "always" or > "message_only" here is good. I will keep this line. Cool, I think i added _do_die_on_error when working on the v2 because I was testing it on an older xfstests where the coredump functionality wasn't available. The v1 of this test only had a 'Silence is Golden', so the test would pass which was really confusing, I fixed that by adding a better 995.out, so this should work with or without it now. > >> tests/generic/017:_do_die_on_error=y >> tests/generic/053:_do_die_on_error=y >> tests/xfs/041:_do_die_on_error=message_only >> tests/xfs/042:_do_die_on_error=message_only >> tests/xfs/596:_do_die_on_error=message_only >> tests/xfs/635:_do_die_on_error=message_only >> >> _do_die_on_error=y doesn't seem valid. > > I think you're right, "y" isn't valid. The _do() helper is quite old and rarely used. > If you have any optimization suggestions, feel free to send a patch to improve it. > For this patch, I'll merge your current version directly. I'll have a think about that, it seemed handy for this test, but I don't understand how the other tests use it. Cheers, Don >> generic/017 doesn't use _do, and I think generic/053 wants _do_die_on_error=always > >> >> Thoughts? >> >> Don >> ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-08-11 9:37 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-07-23 6:26 [PATCH v2] xfs: test xfsdump subtree restores Donald Douwsma 2026-07-28 3:25 ` Christoph Hellwig 2026-07-28 10:34 ` Zorro Lang 2026-07-28 10:29 ` Zorro Lang 2026-07-28 10:39 ` Zorro Lang 2026-08-07 7:48 ` Donald Douwsma 2026-08-10 20:12 ` Zorro Lang 2026-08-11 9:37 ` Donald Douwsma
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox