fstests/xfs: a couple growfs log recovery tests
v2 cover fstests/xfs: a couple growfs log recovery tests
v2:
- Miscellaneous cleanups to both tests.
v1: https://lore.kernel.org/fstests/[email protected]/
Brian Foster (2):
xfs: online grow vs. log recovery stress test
xfs: online grow vs. log recovery stress test (realtime version)
tests/xfs/609 | 81 +++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/609.out | 2 ++ tests/xfs/610 | 83 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/610.out | 2 ++ 4 files changed, 168 insertions(+) create mode 100755 tests/xfs/609 create mode 100644 tests/xfs/609.out create mode 100755 tests/xfs/610 create mode 100644 tests/xfs/610.out
Signature · 1 line
2.46.2
PATCH v2 1/2 xfs: online grow vs. log recovery stress test
fstests includes decent functional tests for online growfs and shrink, and decent stress tests for crash and log recovery, but no combination of the two. This test combines bits from a typical growfs stress test like xfs/104 with crash recovery cycles from a test like generic/388. As a result, this reproduces at least a couple recently fixed issues related to log recovery of online growfs operations.
--- tests/xfs/609 | 81 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/609.out | 2 ++ 2 files changed, 83 insertions(+) create mode 100755 tests/xfs/609 create mode 100644 tests/xfs/609.out
tests/xfs/609 new file +81 -0
@@ -0,0 +1,81 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2024 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 609 +# +# Test XFS online growfs log recovery. +# +. ./common/preamble +_begin_fstest auto growfs stress shutdown log recoveryloop + +# Import common functions. +. ./common/filter + +_stress_scratch() +{ + procs=4 + nops=999999 + # -w ensures that the only ops are ones which cause write I/O + FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs \ + -n $nops $FSSTRESS_AVOID` + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1 & +} + +_require_scratch +_require_command "$XFS_GROWFS_PROG" xfs_growfs +_require_command "$KILLALL_PROG" killall + +_cleanup() +{ + $KILLALL_ALL fsstress > /dev/null 2>&1 + wait + cd / + rm -f $tmp.* +} + +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +. $tmp.mkfs # extract blocksize and data size for scratch device + +endsize=`expr 550 \* 1048576` # stop after growing this big +[ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small" + +nags=4 +size=`expr 125 \* 1048576` # 120 megabytes initially +sizeb=`expr $size / $dbsize` # in data blocks +logblks=$(_scratch_find_xfs_min_logblocks -dsize=${size} -dagcount=${nags}) + +_scratch_mkfs_xfs -lsize=${logblks}b -dsize=${size} -dagcount=${nags} \ + >> $seqres.full || _fail "mkfs failed" +_scratch_mount + +# Grow the filesystem in random sized chunks while stressing and performing +# shutdown and recovery. The randomization is intended to create a mix of sub-ag +# and multi-ag grows. +while [ $size -le $endsize ]; do + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full + _stress_scratch + incsize=$((RANDOM % 40 * 1048576)) + size=`expr $size + $incsize` + sizeb=`expr $size / $dbsize` # in data blocks + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full + $XFS_GROWFS_PROG -D ${sizeb} $SCRATCH_MNT >> $seqres.full + + sleep $((RANDOM % 3)) + _scratch_shutdown + ps -e | grep fsstress > /dev/null 2>&1 + while [ $? -eq 0 ]; do + $KILLALL_PROG -9 fsstress > /dev/null 2>&1 + wait > /dev/null 2>&1 + ps -e | grep fsstress > /dev/null 2>&1 + done + _scratch_cycle_mount || _fail "cycle mount failed" +done > /dev/null 2>&1 +wait # stop for any remaining stress processes + +_scratch_unmount + +echo Silence is golden. + +status=0 +exit
tests/xfs/609.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 609 +Silence is golden.
Signature · 1 line
2.46.2
Re: [PATCH v2 1/2] xfs: online grow vs. log recovery stress test
Quoted 61 lines · Brian Foster
fstests includes decent functional tests for online growfs and shrink, and decent stress tests for crash and log recovery, but no combination of the two. This test combines bits from a typical growfs stress test like xfs/104 with crash recovery cycles from a test like generic/388. As a result, this reproduces at least a couple recently fixed issues related to log recovery of online growfs operations.
Signed-off-by Brian Foster <[email protected]>--- tests/xfs/609 | 81 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/609.out | 2 ++ 2 files changed, 83 insertions(+) create mode 100755 tests/xfs/609 create mode 100644 tests/xfs/609.outtests/xfs/609 new file +39
-0@@ -0,0 +1,81 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2024 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 609 +# +# Test XFS online growfs log recovery. +# +. ./common/preamble +_begin_fstest auto growfs stress shutdown log recoveryloop + +# Import common functions. +. ./common/filter + +_stress_scratch() +{ + procs=4 + nops=999999 + # -w ensures that the only ops are ones which cause write I/O + FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs \ + -n $nops $FSSTRESS_AVOID` + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1 & +} + +_require_scratch +_require_command "$XFS_GROWFS_PROG" xfs_growfs +_require_command "$KILLALL_PROG" killall + +_cleanup() +{ + $KILLALL_ALL fsstress > /dev/null 2>&1 + wait + cd / + rm -f $tmp.* +} + +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +. $tmp.mkfs # extract blocksize and data size for scratch device +
tests/xfs/609 line 49
Quoted 10 lines
tests/xfs/609 new file +10
-0+endsize=`expr 550 \* 1048576` # stop after growing this big +[ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small" + +nags=4 +size=`expr 125 \* 1048576` # 120 megabytes initially +sizeb=`expr $size / $dbsize` # in data blocks +logblks=$(_scratch_find_xfs_min_logblocks -dsize=${size} -dagcount=${nags}) + +_scratch_mkfs_xfs -lsize=${logblks}b -dsize=${size} -dagcount=${nags} \ + >> $seqres.full || _fail "mkfs failed"
This test fails on my testing machine, as [1], due to above mkfs.xfs print a warning:
"mkfs.xfs: small data volume, ignoring data volume stripe unit 128 and stripe width 256"
My test device is scripted, if without the specific mkfs options, it got:
# mkfs.xfs -f $SCRATCH_DEV
meta-data=/dev/sda6 isize=512 agcount=25, agsize=1064176 blks
= sectsz=512 attr=2, projid32bit=1
= crc=1 finobt=1, sparse=1, rmapbt=1
= reflink=1 bigtime=1 inobtcount=1 nrext64=1
= exchange=0
data = bsize=4096 blocks=26604400, imaxpct=25
= sunit=16 swidth=32 blks
naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=0
log =internal log bsize=4096 blocks=179552, version=2
= sectsz=512 sunit=16 blks, lazy-count=1
realtime =none extsz=4096 blocks=0, rtextents=0But if with the specific mkfs options, it got:
# /usr/sbin/mkfs.xfs -f -lsize=3075b -dsize=131072000 -dagcount=4 $SCRATCH_DEV
mkfs.xfs: small data volume, ignoring data volume stripe unit 128 and stripe width 256
meta-data=/dev/sda6 isize=512 agcount=4, agsize=8000 blks
= sectsz=512 attr=2, projid32bit=1
= crc=1 finobt=1, sparse=1, rmapbt=1
= reflink=1 bigtime=1 inobtcount=1 nrext64=1
= exchange=0
data = bsize=4096 blocks=32000, imaxpct=25
= sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=0
log =internal log bsize=4096 blocks=3075, version=2
= sectsz=512 sunit=0 blks, lazy-count=1
realtime =none extsz=4096 blocks=0, rtextents=0Hi Brian, if you think "ignoreing volume stripe" doesn't affect the test, we can filter out the stderr with "2>&1". I can help to change that when I merge.
Others looks good to me, with above confirmation:
Thanks,
Zorro
[1]
SECTION -- default FSTYP -- xfs (non-debug) PLATFORM -- Linux/x86_64 dell-per750-41 6.11.0-0.rc6.49.fc42.x86_64+debug #1 SMP PREEMPT_DYNAMIC Mon Sep 2 02:18:15 UTC 2024 MKFS_OPTIONS -- -f /dev/sda6
MOUNT_OPTIONS -- -o context=system_u:object_r:root_t:s0 /dev/sda6 /mnt/scratch
xfs/609 [failed, exit status 1]_check_dmesg: something found in dmesg (see /root/git/xfstests/results//default/xfs/609.dmesg)
- output mismatch (see /root/git/xfstests/results//default/xfs/609.out.bad)
--- tests/xfs/609.out 2024-10-30 16:29:52.250176790 +0800
+++ /root/git/xfstests/results//default/xfs/609.out.bad 2024-10-30 16:31:01.759590117 +0800
@@ -1,2 +1,2 @@
QA output created by 609
-Silence is golden.
+mkfs.xfs: small data volume, ignoring data volume stripe unit 128 and stripe width 256
...
(Run 'diff -u /root/git/xfstests/tests/xfs/609.out /root/git/xfstests/results//default/xfs/609.out.bad' to see the entire diff)
xfs/610 [not run] External volumes not in use, skipped this test
Ran: xfs/609 xfs/610
Not run: xfs/610
Failures: xfs/609
Failed 1 of 2 tests
Quoted 44 lines
tests/xfs/609 new file +32
-0+_scratch_mount + +# Grow the filesystem in random sized chunks while stressing and performing +# shutdown and recovery. The randomization is intended to create a mix of sub-ag +# and multi-ag grows. +while [ $size -le $endsize ]; do + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full + _stress_scratch + incsize=$((RANDOM % 40 * 1048576)) + size=`expr $size + $incsize` + sizeb=`expr $size / $dbsize` # in data blocks + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full + $XFS_GROWFS_PROG -D ${sizeb} $SCRATCH_MNT >> $seqres.full + + sleep $((RANDOM % 3)) + _scratch_shutdown + ps -e | grep fsstress > /dev/null 2>&1 + while [ $? -eq 0 ]; do + $KILLALL_PROG -9 fsstress > /dev/null 2>&1 + wait > /dev/null 2>&1 + ps -e | grep fsstress > /dev/null 2>&1 + done + _scratch_cycle_mount || _fail "cycle mount failed" +done > /dev/null 2>&1 +wait # stop for any remaining stress processes + +_scratch_unmount + +echo Silence is golden. + +status=0 +exittests/xfs/609.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 609 +Silence is golden.Signature · 1 line
2.46.2
Re: [PATCH v2 1/2] xfs: online grow vs. log recovery stress test
Quoted 109 lines · Zorro Lang
Quoted 61 lines · Brian Foster
fstests includes decent functional tests for online growfs and shrink, and decent stress tests for crash and log recovery, but no combination of the two. This test combines bits from a typical growfs stress test like xfs/104 with crash recovery cycles from a test like generic/388. As a result, this reproduces at least a couple recently fixed issues related to log recovery of online growfs operations.
Signed-off-by Brian Foster <[email protected]>--- tests/xfs/609 | 81 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/609.out | 2 ++ 2 files changed, 83 insertions(+) create mode 100755 tests/xfs/609 create mode 100644 tests/xfs/609.outtests/xfs/609 new file +39
-0@@ -0,0 +1,81 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2024 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 609 +# +# Test XFS online growfs log recovery. +# +. ./common/preamble +_begin_fstest auto growfs stress shutdown log recoveryloop + +# Import common functions. +. ./common/filter + +_stress_scratch() +{ + procs=4 + nops=999999 + # -w ensures that the only ops are ones which cause write I/O + FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs \ + -n $nops $FSSTRESS_AVOID` + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1 & +} + +_require_scratch +_require_command "$XFS_GROWFS_PROG" xfs_growfs +_require_command "$KILLALL_PROG" killall + +_cleanup() +{ + $KILLALL_ALL fsstress > /dev/null 2>&1 + wait + cd / + rm -f $tmp.* +} + +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +. $tmp.mkfs # extract blocksize and data size for scratch device +tests/xfs/609 line 49
Quoted 10 lines
tests/xfs/609 new file +10
-0+endsize=`expr 550 \* 1048576` # stop after growing this big +[ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small" + +nags=4 +size=`expr 125 \* 1048576` # 120 megabytes initially +sizeb=`expr $size / $dbsize` # in data blocks +logblks=$(_scratch_find_xfs_min_logblocks -dsize=${size} -dagcount=${nags}) + +_scratch_mkfs_xfs -lsize=${logblks}b -dsize=${size} -dagcount=${nags} \ + >> $seqres.full || _fail "mkfs failed"This test fails on my testing machine, as [1], due to above mkfs.xfs print a warning:
"mkfs.xfs: small data volume, ignoring data volume stripe unit 128 and stripe width 256"
My test device is scripted, if without the specific mkfs options, it got:
# mkfs.xfs -f $SCRATCH_DEV meta-data=/dev/sda6 isize=512 agcount=25, agsize=1064176 blks = sectsz=512 attr=2, projid32bit=1 = crc=1 finobt=1, sparse=1, rmapbt=1 = reflink=1 bigtime=1 inobtcount=1 nrext64=1 = exchange=0 data = bsize=4096 blocks=26604400, imaxpct=25 = sunit=16 swidth=32 blks naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=0 log =internal log bsize=4096 blocks=179552, version=2 = sectsz=512 sunit=16 blks, lazy-count=1 realtime =none extsz=4096 blocks=0, rtextents=0But if with the specific mkfs options, it got:
# /usr/sbin/mkfs.xfs -f -lsize=3075b -dsize=131072000 -dagcount=4 $SCRATCH_DEV mkfs.xfs: small data volume, ignoring data volume stripe unit 128 and stripe width 256 meta-data=/dev/sda6 isize=512 agcount=4, agsize=8000 blks = sectsz=512 attr=2, projid32bit=1 = crc=1 finobt=1, sparse=1, rmapbt=1 = reflink=1 bigtime=1 inobtcount=1 nrext64=1 = exchange=0 data = bsize=4096 blocks=32000, imaxpct=25 = sunit=0 swidth=0 blks naming =version 2 bsize=4096 ascii-ci=0, ftype=1, parent=0 log =internal log bsize=4096 blocks=3075, version=2 = sectsz=512 sunit=0 blks, lazy-count=1 realtime =none extsz=4096 blocks=0, rtextents=0
Quoted 3 lines
Hi Brian, if you think "ignoreing volume stripe" doesn't affect the test, we can filter out the stderr with "2>&1". I can help to change that when I merge.
Hmm.. I don't think it should affect things. We could probably make the scratch fs a bit bigger, but the idea is to leave enough room so it can be grown a number of times. Any idea if using a particular min size fs makes that warning go away?
Either way I don't think the custom stripe unit/width should make much of a difference for a grow vs. log recovery test, so I'm fine with filtering that out if that's easiest.
Brian
Quoted 76 lines
Others looks good to me, with above confirmation:
Reviewed-by Zorro Lang <[email protected]>Thanks,
Zorro[1]
SECTION -- default FSTYP -- xfs (non-debug) PLATFORM -- Linux/x86_64 dell-per750-41 6.11.0-0.rc6.49.fc42.x86_64+debug #1 SMP PREEMPT_DYNAMIC Mon Sep 2 02:18:15 UTC 2024 MKFS_OPTIONS -- -f /dev/sda6
MOUNT_OPTIONS-- -o context=system_u:object_r:root_t:s0/dev/sda6/mnt/scratchxfs/609 [failed, exit status 1]_check_dmesg: something found in dmesg (see
/root/git/xfstests/results//default/xfs/609.dmesg)
- output mismatch (see/root/git/xfstests/results//default/xfs/609.out.bad)
--- tests/xfs/609.out 2024-10-30 16:29:52.250176790 +0800
+++/root/git/xfstests/results//default/xfs/609.out.bad2024-10-30 16:31:01.759590117 +0800
@@ -1,2 +1,2 @@
QA output created by 609
-Silence is golden.
+mkfs.xfs: small data volume, ignoring data volume stripe unit 128 and stripe width 256
...
(Run 'diff -u/root/git/xfstests/tests/xfs/609.out/root/git/xfstests/results//default/xfs/609.out.bad' to see the entire diff)
xfs/610 [not run] External volumes not in use, skipped this test
Ran: xfs/609 xfs/610
Not run: xfs/610
Failures: xfs/609
Failed 1 of 2 testsQuoted 44 lines
tests/xfs/609 new file +32
-0+_scratch_mount + +# Grow the filesystem in random sized chunks while stressing and performing +# shutdown and recovery. The randomization is intended to create a mix of sub-ag +# and multi-ag grows. +while [ $size -le $endsize ]; do + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full + _stress_scratch + incsize=$((RANDOM % 40 * 1048576)) + size=`expr $size + $incsize` + sizeb=`expr $size / $dbsize` # in data blocks + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full + $XFS_GROWFS_PROG -D ${sizeb} $SCRATCH_MNT >> $seqres.full + + sleep $((RANDOM % 3)) + _scratch_shutdown + ps -e | grep fsstress > /dev/null 2>&1 + while [ $? -eq 0 ]; do + $KILLALL_PROG -9 fsstress > /dev/null 2>&1 + wait > /dev/null 2>&1 + ps -e | grep fsstress > /dev/null 2>&1 + done + _scratch_cycle_mount || _fail "cycle mount failed" +done > /dev/null 2>&1 +wait # stop for any remaining stress processes + +_scratch_unmount + +echo Silence is golden. + +status=0 +exittests/xfs/609.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 609 +Silence is golden.Signature · 1 line
2.46.2
PATCH v2 2/2 xfs: online grow vs. log recovery stress test (realtime version)
In reply to Brian FosterThis is fundamentally the same as the previous growfs vs. log recovery test, with tweaks to support growing the XFS realtime volume on such configurations. Changes include using the appropriate mkfs params, growfs params, and enabling realtime inheritance on the scratch fs.
--- tests/xfs/610 | 83 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/610.out | 2 ++ 2 files changed, 85 insertions(+) create mode 100755 tests/xfs/610 create mode 100644 tests/xfs/610.out
tests/xfs/610 new file +83 -0
@@ -0,0 +1,83 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2024 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 610 +# +# Test XFS online growfs log recovery. +# +. ./common/preamble +_begin_fstest auto growfs stress shutdown log recoveryloop + +# Import common functions. +. ./common/filter + +_stress_scratch() +{ + procs=4 + nops=999999 + # -w ensures that the only ops are ones which cause write I/O + FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs \ + -n $nops $FSSTRESS_AVOID` + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1 & +} + +_require_scratch +_require_realtime +_require_command "$XFS_GROWFS_PROG" xfs_growfs +_require_command "$KILLALL_PROG" killall + +_cleanup() +{ + $KILLALL_ALL fsstress > /dev/null 2>&1 + wait + cd / + rm -f $tmp.* +} + +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +. $tmp.mkfs # extract blocksize and data size for scratch device + +endsize=`expr 550 \* 1048576` # stop after growing this big +[ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small" + +nags=4 +size=`expr 125 \* 1048576` # 120 megabytes initially +sizeb=`expr $size / $dbsize` # in data blocks +logblks=$(_scratch_find_xfs_min_logblocks -rsize=${size} -dagcount=${nags}) + +_scratch_mkfs_xfs -lsize=${logblks}b -rsize=${size} -dagcount=${nags} \ + >> $seqres.full || _fail "mkfs failed" +_scratch_mount +_xfs_force_bdev realtime $SCRATCH_MNT &> /dev/null + +# Grow the filesystem in random sized chunks while stressing and performing +# shutdown and recovery. The randomization is intended to create a mix of sub-ag +# and multi-ag grows. +while [ $size -le $endsize ]; do + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full + _stress_scratch + incsize=$((RANDOM % 40 * 1048576)) + size=`expr $size + $incsize` + sizeb=`expr $size / $dbsize` # in data blocks + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full + $XFS_GROWFS_PROG -R ${sizeb} $SCRATCH_MNT >> $seqres.full + + sleep $((RANDOM % 3)) + _scratch_shutdown + ps -e | grep fsstress > /dev/null 2>&1 + while [ $? -eq 0 ]; do + $KILLALL_PROG -9 fsstress > /dev/null 2>&1 + wait > /dev/null 2>&1 + ps -e | grep fsstress > /dev/null 2>&1 + done + _scratch_cycle_mount || _fail "cycle mount failed" +done > /dev/null 2>&1 +wait # stop for any remaining stress processes + +_scratch_unmount + +echo Silence is golden. + +status=0 +exit
tests/xfs/610.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 610 +Silence is golden.
Signature · 1 line
2.46.2
Re: [PATCH v2 2/2] xfs: online grow vs. log recovery stress test (realtime version)
Quoted 63 lines · Brian Foster
This is fundamentally the same as the previous growfs vs. log recovery test, with tweaks to support growing the XFS realtime volume on such configurations. Changes include using the appropriate mkfs params, growfs params, and enabling realtime inheritance on the scratch fs.
Signed-off-by Brian Foster <[email protected]>---
tests/xfs/610 | 83 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/610.out | 2 ++ 2 files changed, 85 insertions(+) create mode 100755 tests/xfs/610 create mode 100644 tests/xfs/610.outtests/xfs/610 new file +40
-0@@ -0,0 +1,83 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2024 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 610 +# +# Test XFS online growfs log recovery. +# +. ./common/preamble +_begin_fstest auto growfs stress shutdown log recoveryloop + +# Import common functions. +. ./common/filter + +_stress_scratch() +{ + procs=4 + nops=999999 + # -w ensures that the only ops are ones which cause write I/O + FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs \ + -n $nops $FSSTRESS_AVOID` + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1 & +} + +_require_scratch +_require_realtime +_require_command "$XFS_GROWFS_PROG" xfs_growfs +_require_command "$KILLALL_PROG" killall + +_cleanup() +{ + $KILLALL_ALL fsstress > /dev/null 2>&1 + wait + cd / + rm -f $tmp.* +} + +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +. $tmp.mkfs # extract blocksize and data size for scratch device +
tests/xfs/610 line 50
Quoted 10 lines
tests/xfs/610 new file +10
-0+endsize=`expr 550 \* 1048576` # stop after growing this big +[ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small" + +nags=4 +size=`expr 125 \* 1048576` # 120 megabytes initially +sizeb=`expr $size / $dbsize` # in data blocks +logblks=$(_scratch_find_xfs_min_logblocks -rsize=${size} -dagcount=${nags}) + +_scratch_mkfs_xfs -lsize=${logblks}b -rsize=${size} -dagcount=${nags} \ + >> $seqres.full || _fail "mkfs failed"
Ahah, not sure why this case didn't hit the failure of xfs/609, do you think we should filter out the mkfs warning too?
SECTION -- default FSTYP -- xfs (non-debug) PLATFORM -- Linux/x86_64 dell-per750-41 6.12.0-0.rc5.44.fc42.x86_64 #1 SMP PREEMPT_DYNAMIC Mon Oct 28 14:12:55 UTC 2024 MKFS_OPTIONS -- -f -rrtdev=/dev/mapper/testvg-rtdev /dev/sda6
MOUNT_OPTIONS -- -o context=system_u:object_r:root_t:s0 -ortdev=/dev/mapper/testvg-rtdev /dev/sda6 /mnt/scratch
xfs/610 39s
Ran: xfs/610
Passed all 1 tests
Quoted 14 lines
tests/xfs/610 new file +14
-0+_scratch_mount +_xfs_force_bdev realtime $SCRATCH_MNT &> /dev/null + +# Grow the filesystem in random sized chunks while stressing and performing +# shutdown and recovery. The randomization is intended to create a mix of sub-ag +# and multi-ag grows. +while [ $size -le $endsize ]; do + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full + _stress_scratch + incsize=$((RANDOM % 40 * 1048576)) + size=`expr $size + $incsize` + sizeb=`expr $size / $dbsize` # in data blocks + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full + $XFS_GROWFS_PROG -R ${sizeb} $SCRATCH_MNT >> $seqres.full
tests/xfs/610 line 74
Quoted 10 lines
tests/xfs/610 new file +10
-0+ + sleep $((RANDOM % 3)) + _scratch_shutdown + ps -e | grep fsstress > /dev/null 2>&1 + while [ $? -eq 0 ]; do + $KILLALL_PROG -9 fsstress > /dev/null 2>&1 + wait > /dev/null 2>&1 + ps -e | grep fsstress > /dev/null 2>&1 + done + _scratch_cycle_mount || _fail "cycle mount failed"
_scratch_cycle_mount does _fail if it fails, I'll help to remove the "|| _fail ..."
tests/xfs/610 line 78
Quoted 4 lines
tests/xfs/610 new file +4
-0+done > /dev/null 2>&1 +wait # stop for any remaining stress processes + +_scratch_unmount
If this ^^ isn't a necessary step of bug reproduce, then we don't need to do this manually, each test case does that at the end. I can help to remove it when I merge this patch.
Others looks good to me,
Quoted 17 lines
tests/xfs/610 new file +5
-0+ +echo Silence is golden. + +status=0 +exittests/xfs/610.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 610 +Silence is golden.Signature · 1 line
2.46.2
Re: [PATCH v2 2/2] xfs: online grow vs. log recovery stress test (realtime version)
Quoted 69 lines · Zorro Lang
Quoted 68 lines · Brian Foster
This is fundamentally the same as the previous growfs vs. log recovery test, with tweaks to support growing the XFS realtime volume on such configurations. Changes include using the appropriate mkfs params, growfs params, and enabling realtime inheritance on the scratch fs.
Signed-off-by Brian Foster <[email protected]>---
tests/xfs/610 | 83 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/610.out | 2 ++ 2 files changed, 85 insertions(+) create mode 100755 tests/xfs/610 create mode 100644 tests/xfs/610.outtests/xfs/610 new file +45
-0@@ -0,0 +1,83 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2024 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 610 +# +# Test XFS online growfs log recovery. +# +. ./common/preamble +_begin_fstest auto growfs stress shutdown log recoveryloop + +# Import common functions. +. ./common/filter + +_stress_scratch() +{ + procs=4 + nops=999999 + # -w ensures that the only ops are ones which cause write I/O + FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs \ + -n $nops $FSSTRESS_AVOID` + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1 & +} + +_require_scratch +_require_realtime +_require_command "$XFS_GROWFS_PROG" xfs_growfs +_require_command "$KILLALL_PROG" killall + +_cleanup() +{ + $KILLALL_ALL fsstress > /dev/null 2>&1 + wait + cd / + rm -f $tmp.* +} + +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +. $tmp.mkfs # extract blocksize and data size for scratch device + +endsize=`expr 550 \* 1048576` # stop after growing this big +[ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small" + +nags=4 +size=`expr 125 \* 1048576` # 120 megabytes initially
Quoted 9 lines
tests/xfs/610 line 50
Quoted 5 lines
tests/xfs/610 new file +5
-0+sizeb=`expr $size / $dbsize` # in data blocks +logblks=$(_scratch_find_xfs_min_logblocks -rsize=${size} -dagcount=${nags}) + +_scratch_mkfs_xfs -lsize=${logblks}b -rsize=${size} -dagcount=${nags} \ + >> $seqres.full || _fail "mkfs failed"Ahah, not sure why this case didn't hit the failure of xfs/609, do you think we should filter out the mkfs warning too?
My experience with this test is that it didn't reproduce any problems on current master, but Darrick had originally customized it from xfs/609 and found it useful to identify some issues in outstanding development work around rt.
I've been trying to keep the two tests consistent outside of enabling the appropriate rt bits, so I'd suggest we apply the same changes here as for 609 around the mkfs thing (whichever way that goes).
Quoted 28 lines
SECTION -- default FSTYP -- xfs (non-debug) PLATFORM -- Linux/x86_64 dell-per750-41 6.12.0-0.rc5.44.fc42.x86_64 #1 SMP PREEMPT_DYNAMIC Mon Oct 28 14:12:55 UTC 2024 MKFS_OPTIONS -- -f -rrtdev=/dev/mapper/testvg-rtdev /dev/sda6
MOUNT_OPTIONS-- -o context=system_u:object_r:root_t:s0 -ortdev=/dev/mapper/testvg-rtdev/dev/sda6/mnt/scratchxfs/610 39s
Ran: xfs/610
Passed all 1 testsQuoted 18 lines
tests/xfs/610 new file +18
-0+_scratch_mount +_xfs_force_bdev realtime $SCRATCH_MNT &> /dev/null + +# Grow the filesystem in random sized chunks while stressing and performing +# shutdown and recovery. The randomization is intended to create a mix of sub-ag +# and multi-ag grows. +while [ $size -le $endsize ]; do + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full + _stress_scratch + incsize=$((RANDOM % 40 * 1048576)) + size=`expr $size + $incsize` + sizeb=`expr $size / $dbsize` # in data blocks + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full + $XFS_GROWFS_PROG -R ${sizeb} $SCRATCH_MNT >> $seqres.full + + sleep $((RANDOM % 3)) + _scratch_shutdown + ps -e | grep fsstress > /dev/null 2>&1
Quoted 9 lines
tests/xfs/610 line 74
Quoted 6 lines
tests/xfs/610 new file +6
-0+ while [ $? -eq 0 ]; do + $KILLALL_PROG -9 fsstress > /dev/null 2>&1 + wait > /dev/null 2>&1 + ps -e | grep fsstress > /dev/null 2>&1 + done + _scratch_cycle_mount || _fail "cycle mount failed"
_scratch_cycle_mountdoes_failif it fails, I'll help to remove the "||_fail..."
Ok.
Quoted 9 lines
tests/xfs/610 line 78
Quoted 4 lines
tests/xfs/610 new file +4
-0+done > /dev/null 2>&1 +wait # stop for any remaining stress processes + +_scratch_unmountIf this ^^ isn't a necessary step of bug reproduce, then we don't need to do this manually, each test case does that at the end. I can help to remove it when I merge this patch.
Hm I don't think so. That might also just be copy/paste leftover. Feel free to drop it.
Quoted 4 lines
Others looks good to me,
Reviewed-by Zorro Lang <[email protected]>
Thanks!
Brian
Quoted 19 lines
Quoted 18 lines
tests/xfs/610 new file +5
-0+ +echo Silence is golden. + +status=0 +exittests/xfs/610.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 610 +Silence is golden.Signature · 1 line
2.46.2
Re: [PATCH v2 2/2] xfs: online grow vs. log recovery stress test (realtime version)
Quoted 70 lines · Brian Foster
Quoted 69 lines · Zorro Lang
Quoted 68 lines · Brian Foster
This is fundamentally the same as the previous growfs vs. log recovery test, with tweaks to support growing the XFS realtime volume on such configurations. Changes include using the appropriate mkfs params, growfs params, and enabling realtime inheritance on the scratch fs.
Signed-off-by Brian Foster <[email protected]>---
tests/xfs/610 | 83 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/610.out | 2 ++ 2 files changed, 85 insertions(+) create mode 100755 tests/xfs/610 create mode 100644 tests/xfs/610.outtests/xfs/610 new file +45
-0@@ -0,0 +1,83 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2024 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 610 +# +# Test XFS online growfs log recovery. +# +. ./common/preamble +_begin_fstest auto growfs stress shutdown log recoveryloop + +# Import common functions. +. ./common/filter + +_stress_scratch() +{ + procs=4 + nops=999999 + # -w ensures that the only ops are ones which cause write I/O + FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs \ + -n $nops $FSSTRESS_AVOID` + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1 & +} + +_require_scratch +_require_realtime +_require_command "$XFS_GROWFS_PROG" xfs_growfs +_require_command "$KILLALL_PROG" killall + +_cleanup() +{ + $KILLALL_ALL fsstress > /dev/null 2>&1 + wait + cd / + rm -f $tmp.* +} + +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +. $tmp.mkfs # extract blocksize and data size for scratch device + +endsize=`expr 550 \* 1048576` # stop after growing this big +[ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small" + +nags=4 +size=`expr 125 \* 1048576` # 120 megabytes initially
Quoted 8 lines
Quoted 8 lines
tests/xfs/610 line 50
Quoted 5 lines
tests/xfs/610 new file +5
-0+sizeb=`expr $size / $dbsize` # in data blocks +logblks=$(_scratch_find_xfs_min_logblocks -rsize=${size} -dagcount=${nags}) + +_scratch_mkfs_xfs -lsize=${logblks}b -rsize=${size} -dagcount=${nags} \ + >> $seqres.full || _fail "mkfs failed"Ahah, not sure why this case didn't hit the failure of xfs/609, do you think we should filter out the mkfs warning too?
It won't-- the warning you got with 609 was about ignoring stripe geometry on a small data volume. This mkfs invocation creates a filesystem with a normal size data volume and a small rt volume, and mkfs doesn't complain about small rt volumes.
--D
Quoted 92 lines
My experience with this test is that it didn't reproduce any problems on current master, but Darrick had originally customized it from xfs/609 and found it useful to identify some issues in outstanding development work around rt.
I've been trying to keep the two tests consistent outside of enabling the appropriate rt bits, so I'd suggest we apply the same changes here as for 609 around the mkfs thing (whichever way that goes).
Quoted 28 lines
SECTION -- default FSTYP -- xfs (non-debug) PLATFORM -- Linux/x86_64 dell-per750-41 6.12.0-0.rc5.44.fc42.x86_64 #1 SMP PREEMPT_DYNAMIC Mon Oct 28 14:12:55 UTC 2024 MKFS_OPTIONS -- -f -rrtdev=/dev/mapper/testvg-rtdev /dev/sda6
MOUNT_OPTIONS-- -o context=system_u:object_r:root_t:s0 -ortdev=/dev/mapper/testvg-rtdev/dev/sda6/mnt/scratchxfs/610 39s
Ran: xfs/610
Passed all 1 testsQuoted 18 lines
tests/xfs/610 new file +18
-0+_scratch_mount +_xfs_force_bdev realtime $SCRATCH_MNT &> /dev/null + +# Grow the filesystem in random sized chunks while stressing and performing +# shutdown and recovery. The randomization is intended to create a mix of sub-ag +# and multi-ag grows. +while [ $size -le $endsize ]; do + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full + _stress_scratch + incsize=$((RANDOM % 40 * 1048576)) + size=`expr $size + $incsize` + sizeb=`expr $size / $dbsize` # in data blocks + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full + $XFS_GROWFS_PROG -R ${sizeb} $SCRATCH_MNT >> $seqres.full + + sleep $((RANDOM % 3)) + _scratch_shutdown + ps -e | grep fsstress > /dev/null 2>&1Quoted 9 lines
tests/xfs/610 line 74
Quoted 6 lines
tests/xfs/610 new file +6
-0+ while [ $? -eq 0 ]; do + $KILLALL_PROG -9 fsstress > /dev/null 2>&1 + wait > /dev/null 2>&1 + ps -e | grep fsstress > /dev/null 2>&1 + done + _scratch_cycle_mount || _fail "cycle mount failed"
_scratch_cycle_mountdoes_failif it fails, I'll help to remove the "||_fail..."Ok.
Quoted 9 lines
tests/xfs/610 line 78
Quoted 4 lines
tests/xfs/610 new file +4
-0+done > /dev/null 2>&1 +wait # stop for any remaining stress processes + +_scratch_unmountIf this ^^ isn't a necessary step of bug reproduce, then we don't need to do this manually, each test case does that at the end. I can help to remove it when I merge this patch.
Hm I don't think so. That might also just be copy/paste leftover. Feel free to drop it.
Quoted 4 lines
Others looks good to me,
Reviewed-by Zorro Lang <[email protected]>Thanks!
Brian
Quoted 19 lines
Quoted 18 lines
tests/xfs/610 new file +5
-0+ +echo Silence is golden. + +status=0 +exittests/xfs/610.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 610 +Silence is golden.Signature · 1 line
2.46.2
Re: [PATCH v2 2/2] xfs: online grow vs. log recovery stress test (realtime version)
Quoted 80 lines · Darrick J. Wong
Quoted 70 lines · Brian Foster
Quoted 69 lines · Zorro Lang
Quoted 68 lines · Brian Foster
This is fundamentally the same as the previous growfs vs. log recovery test, with tweaks to support growing the XFS realtime volume on such configurations. Changes include using the appropriate mkfs params, growfs params, and enabling realtime inheritance on the scratch fs.
Signed-off-by Brian Foster <[email protected]>---
tests/xfs/610 | 83 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/610.out | 2 ++ 2 files changed, 85 insertions(+) create mode 100755 tests/xfs/610 create mode 100644 tests/xfs/610.outtests/xfs/610 new file +45
-0@@ -0,0 +1,83 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2024 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 610 +# +# Test XFS online growfs log recovery. +# +. ./common/preamble +_begin_fstest auto growfs stress shutdown log recoveryloop + +# Import common functions. +. ./common/filter + +_stress_scratch() +{ + procs=4 + nops=999999 + # -w ensures that the only ops are ones which cause write I/O + FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -w -p $procs \ + -n $nops $FSSTRESS_AVOID` + $FSSTRESS_PROG $FSSTRESS_ARGS >> $seqres.full 2>&1 & +} + +_require_scratch +_require_realtime +_require_command "$XFS_GROWFS_PROG" xfs_growfs +_require_command "$KILLALL_PROG" killall + +_cleanup() +{ + $KILLALL_ALL fsstress > /dev/null 2>&1 + wait + cd / + rm -f $tmp.* +} + +_scratch_mkfs_xfs | _filter_mkfs >$seqres.full 2>$tmp.mkfs +. $tmp.mkfs # extract blocksize and data size for scratch device + +endsize=`expr 550 \* 1048576` # stop after growing this big +[ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small" + +nags=4 +size=`expr 125 \* 1048576` # 120 megabytes initiallyQuoted 8 lines
Quoted 8 lines
tests/xfs/610 line 50
Quoted 5 lines
tests/xfs/610 new file +5
-0+sizeb=`expr $size / $dbsize` # in data blocks +logblks=$(_scratch_find_xfs_min_logblocks -rsize=${size} -dagcount=${nags}) + +_scratch_mkfs_xfs -lsize=${logblks}b -rsize=${size} -dagcount=${nags} \ + >> $seqres.full || _fail "mkfs failed"Ahah, not sure why this case didn't hit the failure of xfs/609, do you think we should filter out the mkfs warning too?
Quoted 4 lines
It won't-- the warning you got with 609 was about ignoring stripe geometry on a small data volume. This mkfs invocation creates a filesystem with a normal size data volume and a small rt volume, and mkfs doesn't complain about small rt volumes.
Oh, good to know that, thanks Darick :)
Quoted 96 lines
--D
Quoted 92 lines
My experience with this test is that it didn't reproduce any problems on current master, but Darrick had originally customized it from xfs/609 and found it useful to identify some issues in outstanding development work around rt.
I've been trying to keep the two tests consistent outside of enabling the appropriate rt bits, so I'd suggest we apply the same changes here as for 609 around the mkfs thing (whichever way that goes).
Quoted 28 lines
SECTION -- default FSTYP -- xfs (non-debug) PLATFORM -- Linux/x86_64 dell-per750-41 6.12.0-0.rc5.44.fc42.x86_64 #1 SMP PREEMPT_DYNAMIC Mon Oct 28 14:12:55 UTC 2024 MKFS_OPTIONS -- -f -rrtdev=/dev/mapper/testvg-rtdev /dev/sda6
MOUNT_OPTIONS-- -o context=system_u:object_r:root_t:s0 -ortdev=/dev/mapper/testvg-rtdev/dev/sda6/mnt/scratchxfs/610 39s
Ran: xfs/610
Passed all 1 testsQuoted 18 lines
tests/xfs/610 new file +18
-0+_scratch_mount +_xfs_force_bdev realtime $SCRATCH_MNT &> /dev/null + +# Grow the filesystem in random sized chunks while stressing and performing +# shutdown and recovery. The randomization is intended to create a mix of sub-ag +# and multi-ag grows. +while [ $size -le $endsize ]; do + echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full + _stress_scratch + incsize=$((RANDOM % 40 * 1048576)) + size=`expr $size + $incsize` + sizeb=`expr $size / $dbsize` # in data blocks + echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full + $XFS_GROWFS_PROG -R ${sizeb} $SCRATCH_MNT >> $seqres.full + + sleep $((RANDOM % 3)) + _scratch_shutdown + ps -e | grep fsstress > /dev/null 2>&1Quoted 9 lines
tests/xfs/610 line 74
Quoted 6 lines
tests/xfs/610 new file +6
-0+ while [ $? -eq 0 ]; do + $KILLALL_PROG -9 fsstress > /dev/null 2>&1 + wait > /dev/null 2>&1 + ps -e | grep fsstress > /dev/null 2>&1 + done + _scratch_cycle_mount || _fail "cycle mount failed"
_scratch_cycle_mountdoes_failif it fails, I'll help to remove the "||_fail..."Ok.
Quoted 9 lines
tests/xfs/610 line 78
Quoted 4 lines
tests/xfs/610 new file +4
-0+done > /dev/null 2>&1 +wait # stop for any remaining stress processes + +_scratch_unmountIf this ^^ isn't a necessary step of bug reproduce, then we don't need to do this manually, each test case does that at the end. I can help to remove it when I merge this patch.
Hm I don't think so. That might also just be copy/paste leftover. Feel free to drop it.
Quoted 4 lines
Others looks good to me,
Reviewed-by Zorro Lang <[email protected]>Thanks!
Brian
Quoted 19 lines
Quoted 18 lines
tests/xfs/610 new file +5
-0+ +echo Silence is golden. + +status=0 +exittests/xfs/610.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 610 +Silence is golden.Signature · 1 line
2.46.2
Still looks good to me (but I'm a horrible test reviewer, so that might not count much :)):
Quoted 2 lines · Christoph Hellwig
Still looks good to me (but I'm a horrible test reviewer, so that might not count much :)):
You review always counts much :)
Quoted 3 lines
Reviewed-by Christoph Hellwig <[email protected]>