| Message ID | 20220619134657.1846292-2-amir73il@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | aborted fstests may leave frozen fs behind | expand |
On Sun, Jun 19, 2022 at 04:46:54PM +0300, Amir Goldstein wrote: > And add a few tests that use freeze to the freeze group > > Signed-off-by: Amir Goldstein <amir73il@gmail.com> > --- > tests/xfs/119 | 1 + > tests/xfs/318 | 3 ++- > tests/xfs/325 | 3 ++- > tests/xfs/422 | 3 ++- > tests/xfs/438 | 2 +- > tests/xfs/517 | 1 + > 6 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/tests/xfs/119 b/tests/xfs/119 > index a1180371..b6f96601 100755 > --- a/tests/xfs/119 > +++ b/tests/xfs/119 > @@ -20,6 +20,7 @@ _begin_fstest log v2log auto freeze > _supported_fs xfs > > _require_scratch > +_require_freeze > > # this may hang > sync > diff --git a/tests/xfs/318 b/tests/xfs/318 > index 38c7aa60..be93f9ab 100755 > --- a/tests/xfs/318 > +++ b/tests/xfs/318 > @@ -7,7 +7,7 @@ > # Simulate free extent errors with a file write and a file remove. > # > . ./common/preamble > -_begin_fstest auto quick rw > +_begin_fstest auto quick rw freeze Not sure why these tests (318, 325, 422, 438) are being added to the freeze group -- they use freeze to force xfs to do background tasks (inodegc, initializing quota, etc), but they are not themselves functionality testing for filesystem freezing. The _require_freeze additions look fine though. --D > > # Override the default cleanup function. > _cleanup() > @@ -26,6 +26,7 @@ _supported_fs xfs > _require_scratch > _require_error_injection > _require_xfs_io_error_injection "rmap_finish_one" > +_require_freeze > > blksz=65536 > blks=64 > diff --git a/tests/xfs/325 b/tests/xfs/325 > index 5b26b2b3..c6861fbc 100755 > --- a/tests/xfs/325 > +++ b/tests/xfs/325 > @@ -8,7 +8,7 @@ > # Inject an error during extent freeing to test log recovery. > # > . ./common/preamble > -_begin_fstest auto quick clone > +_begin_fstest auto quick clone freeze > > # Override the default cleanup function. > _cleanup() > @@ -29,6 +29,7 @@ _require_cp_reflink > _require_scratch_reflink > _require_error_injection > _require_xfs_io_error_injection "free_extent" > +_require_freeze > > blksz=65536 > blks=30 > diff --git a/tests/xfs/422 b/tests/xfs/422 > index 175253aa..a83a66df 100755 > --- a/tests/xfs/422 > +++ b/tests/xfs/422 > @@ -9,7 +9,7 @@ > # activity, so we can't have userspace wandering in and thawing it. > # > . ./common/preamble > -_begin_fstest dangerous_scrub dangerous_online_repair > +_begin_fstest dangerous_scrub dangerous_online_repair freeze > > _register_cleanup "_cleanup" BUS > > @@ -24,6 +24,7 @@ _require_xfs_scratch_rmapbt > _require_xfs_io_command "scrub" > _require_xfs_io_error_injection "force_repair" > _require_command "$KILLALL_PROG" killall > +_require_freeze > > echo "Format and populate" > _scratch_mkfs > "$seqres.full" 2>&1 > diff --git a/tests/xfs/438 b/tests/xfs/438 > index c3008b1c..cfe75bd8 100755 > --- a/tests/xfs/438 > +++ b/tests/xfs/438 > @@ -21,7 +21,7 @@ > # Fixed by upstream commit 373b058 ("xfs: Properly retry failed dquot > # items in case of error during buffer writeback") > . ./common/preamble > -_begin_fstest auto quick quota > +_begin_fstest auto quick quota freeze > > # Override the default cleanup function. > _cleanup() > diff --git a/tests/xfs/517 b/tests/xfs/517 > index 88c4f43b..f7f9a8a2 100755 > --- a/tests/xfs/517 > +++ b/tests/xfs/517 > @@ -29,6 +29,7 @@ _supported_fs xfs > _require_xfs_scratch_rmapbt > _require_xfs_io_command "fsmap" > _require_command "$KILLALL_PROG" killall > +_require_freeze > > echo "Format and populate" > _scratch_mkfs > "$seqres.full" 2>&1 > -- > 2.25.1 >
On Thu, Jun 23, 2022 at 9:00 PM Darrick J. Wong <djwong@kernel.org> wrote: > > On Sun, Jun 19, 2022 at 04:46:54PM +0300, Amir Goldstein wrote: > > And add a few tests that use freeze to the freeze group > > > > Signed-off-by: Amir Goldstein <amir73il@gmail.com> > > --- > > tests/xfs/119 | 1 + > > tests/xfs/318 | 3 ++- > > tests/xfs/325 | 3 ++- > > tests/xfs/422 | 3 ++- > > tests/xfs/438 | 2 +- > > tests/xfs/517 | 1 + > > 6 files changed, 9 insertions(+), 4 deletions(-) > > > > diff --git a/tests/xfs/119 b/tests/xfs/119 > > index a1180371..b6f96601 100755 > > --- a/tests/xfs/119 > > +++ b/tests/xfs/119 > > @@ -20,6 +20,7 @@ _begin_fstest log v2log auto freeze > > _supported_fs xfs > > > > _require_scratch > > +_require_freeze > > > > # this may hang > > sync > > diff --git a/tests/xfs/318 b/tests/xfs/318 > > index 38c7aa60..be93f9ab 100755 > > --- a/tests/xfs/318 > > +++ b/tests/xfs/318 > > @@ -7,7 +7,7 @@ > > # Simulate free extent errors with a file write and a file remove. > > # > > . ./common/preamble > > -_begin_fstest auto quick rw > > +_begin_fstest auto quick rw freeze > > Not sure why these tests (318, 325, 422, 438) are being added to the > freeze group -- they use freeze to force xfs to do background tasks > (inodegc, initializing quota, etc), but they are not themselves > functionality testing for filesystem freezing. True. I was hesitant about that part myself. But think about it this way - One of the reasons is that when developers change some code in the vicinity of freeze they want to run a fast smoke test with tests the exercise freeze. In this perspective, it seems useful that the freeze smoke test will also exercise freeze when used as a trigger for internal xfs tasks. That was my thinking, but I have no strong feelings either way, so if others don't like it, I can drop this part. > > The _require_freeze additions look fine though. > Thanks, Amir.
On Fri, Jun 24, 2022 at 07:05:46AM +0300, Amir Goldstein wrote: > On Thu, Jun 23, 2022 at 9:00 PM Darrick J. Wong <djwong@kernel.org> wrote: > > > > On Sun, Jun 19, 2022 at 04:46:54PM +0300, Amir Goldstein wrote: > > > And add a few tests that use freeze to the freeze group > > > > > > Signed-off-by: Amir Goldstein <amir73il@gmail.com> > > > --- > > > tests/xfs/119 | 1 + > > > tests/xfs/318 | 3 ++- > > > tests/xfs/325 | 3 ++- > > > tests/xfs/422 | 3 ++- > > > tests/xfs/438 | 2 +- > > > tests/xfs/517 | 1 + > > > 6 files changed, 9 insertions(+), 4 deletions(-) > > > > > > diff --git a/tests/xfs/119 b/tests/xfs/119 > > > index a1180371..b6f96601 100755 > > > --- a/tests/xfs/119 > > > +++ b/tests/xfs/119 > > > @@ -20,6 +20,7 @@ _begin_fstest log v2log auto freeze > > > _supported_fs xfs > > > > > > _require_scratch > > > +_require_freeze > > > > > > # this may hang > > > sync > > > diff --git a/tests/xfs/318 b/tests/xfs/318 > > > index 38c7aa60..be93f9ab 100755 > > > --- a/tests/xfs/318 > > > +++ b/tests/xfs/318 > > > @@ -7,7 +7,7 @@ > > > # Simulate free extent errors with a file write and a file remove. > > > # > > > . ./common/preamble > > > -_begin_fstest auto quick rw > > > +_begin_fstest auto quick rw freeze > > > > Not sure why these tests (318, 325, 422, 438) are being added to the > > freeze group -- they use freeze to force xfs to do background tasks > > (inodegc, initializing quota, etc), but they are not themselves > > functionality testing for filesystem freezing. > > True. I was hesitant about that part myself. > But think about it this way - > > One of the reasons is that when developers change > some code in the vicinity of freeze they want to run a fast > smoke test with tests the exercise freeze. > In this perspective, it seems useful that the freeze smoke test > will also exercise freeze when used as a trigger for internal > xfs tasks. > > That was my thinking, but I have no strong feelings > either way, so if others don't like it, I can drop this part. I'm good to with/without (318, 325, 422, 438) in freeze group. If this change doesn't bring in troubles to Darrick and others, I think you can keep current version. Thanks, Zorro > > > > > The _require_freeze additions look fine though. > > > > Thanks, > Amir. >
diff --git a/tests/xfs/119 b/tests/xfs/119 index a1180371..b6f96601 100755 --- a/tests/xfs/119 +++ b/tests/xfs/119 @@ -20,6 +20,7 @@ _begin_fstest log v2log auto freeze _supported_fs xfs _require_scratch +_require_freeze # this may hang sync diff --git a/tests/xfs/318 b/tests/xfs/318 index 38c7aa60..be93f9ab 100755 --- a/tests/xfs/318 +++ b/tests/xfs/318 @@ -7,7 +7,7 @@ # Simulate free extent errors with a file write and a file remove. # . ./common/preamble -_begin_fstest auto quick rw +_begin_fstest auto quick rw freeze # Override the default cleanup function. _cleanup() @@ -26,6 +26,7 @@ _supported_fs xfs _require_scratch _require_error_injection _require_xfs_io_error_injection "rmap_finish_one" +_require_freeze blksz=65536 blks=64 diff --git a/tests/xfs/325 b/tests/xfs/325 index 5b26b2b3..c6861fbc 100755 --- a/tests/xfs/325 +++ b/tests/xfs/325 @@ -8,7 +8,7 @@ # Inject an error during extent freeing to test log recovery. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone freeze # Override the default cleanup function. _cleanup() @@ -29,6 +29,7 @@ _require_cp_reflink _require_scratch_reflink _require_error_injection _require_xfs_io_error_injection "free_extent" +_require_freeze blksz=65536 blks=30 diff --git a/tests/xfs/422 b/tests/xfs/422 index 175253aa..a83a66df 100755 --- a/tests/xfs/422 +++ b/tests/xfs/422 @@ -9,7 +9,7 @@ # activity, so we can't have userspace wandering in and thawing it. # . ./common/preamble -_begin_fstest dangerous_scrub dangerous_online_repair +_begin_fstest dangerous_scrub dangerous_online_repair freeze _register_cleanup "_cleanup" BUS @@ -24,6 +24,7 @@ _require_xfs_scratch_rmapbt _require_xfs_io_command "scrub" _require_xfs_io_error_injection "force_repair" _require_command "$KILLALL_PROG" killall +_require_freeze echo "Format and populate" _scratch_mkfs > "$seqres.full" 2>&1 diff --git a/tests/xfs/438 b/tests/xfs/438 index c3008b1c..cfe75bd8 100755 --- a/tests/xfs/438 +++ b/tests/xfs/438 @@ -21,7 +21,7 @@ # Fixed by upstream commit 373b058 ("xfs: Properly retry failed dquot # items in case of error during buffer writeback") . ./common/preamble -_begin_fstest auto quick quota +_begin_fstest auto quick quota freeze # Override the default cleanup function. _cleanup() diff --git a/tests/xfs/517 b/tests/xfs/517 index 88c4f43b..f7f9a8a2 100755 --- a/tests/xfs/517 +++ b/tests/xfs/517 @@ -29,6 +29,7 @@ _supported_fs xfs _require_xfs_scratch_rmapbt _require_xfs_io_command "fsmap" _require_command "$KILLALL_PROG" killall +_require_freeze echo "Format and populate" _scratch_mkfs > "$seqres.full" 2>&1
And add a few tests that use freeze to the freeze group Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- tests/xfs/119 | 1 + tests/xfs/318 | 3 ++- tests/xfs/325 | 3 ++- tests/xfs/422 | 3 ++- tests/xfs/438 | 2 +- tests/xfs/517 | 1 + 6 files changed, 9 insertions(+), 4 deletions(-)