aborted fstests may leave frozen fs behind
v2 cover aborted fstests may leave frozen fs behind
Zorro,
As discussed on v1, this series fixes cleanup routines of freeze tests without adding auto-cleanup in check.
I also took a closer look at some test cleanups and handled the kill of background processes after unfreeze.
I tested that all the tests in the 'freeze' group that I modified run to completion with no regressions.
I did not try to interrupt all the rest of the tests, because interrupting a test at exact time that it is frozen is quite hard.
I did test that interrupting xfs/517 several times did not leave the fs frozen. Before the changes, it was rather easy to get it to leave a frozen fs behind, because the freeze_loop() keeps the fs frozen around half of the time that the test is running.
Thanks,
Amir.
Changes since v1:
- Remove auto-cleanup in check
- Add more kill+wait in cleanups where needed
- Change the cleanup routines of the freeze_loops
Amir Goldstein (3):
fstests: add missing _require_freeze() to tests
fstests: unfreeze fs on cleanup routines xfs/{422,517}: kill background jobs on test termination
tests/generic/068 | 14 ++++++++++---- tests/generic/085 | 3 +++ tests/generic/280 | 13 ++++++++++++- tests/generic/390 | 8 +++++++- tests/generic/459 | 2 ++ tests/generic/491 | 9 +++++++++ tests/xfs/011 | 3 ++- tests/xfs/119 | 10 ++++++++++ tests/xfs/297 | 11 +++++++++++ tests/xfs/318 | 6 ++++-- tests/xfs/325 | 6 ++++-- tests/xfs/422 | 35 ++++++++++++++++++++++++++++++++--- tests/xfs/438 | 4 +++- tests/xfs/517 | 27 ++++++++++++++++++++++++--- 14 files changed, 133 insertions(+), 18 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/3 fstests: add missing _require_freeze() to tests
And add a few tests that use freeze to the freeze group
--- 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(-)
tests/xfs/119 +1 -0
@@ -20,6 +20,7 @@ _begin_fstest log v2log auto freeze _supported_fs xfs _require_scratch +_require_freeze # this may hang sync
tests/xfs/318 +2 -1
@@ -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
tests/xfs/325 +2 -1
@@ -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
tests/xfs/422 +2 -1
@@ -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
tests/xfs/438 +1 -1
@@ -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()
tests/xfs/517 +1 -0
@@ -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
Signature · 1 line
2.25.1
Re: [PATCH v2 1/3] fstests: add missing _require_freeze() to tests
Quoted 4 lines · Amir Goldstein
And add a few tests that use freeze to the freeze group
Signed-off-by Amir Goldstein <[email protected]>---
Although there were some different points about if "318, 325, 422, 438" should be in freeze group, I don't mind having them in freeze group personally. So ...
Quoted 111 lines
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(-)tests/xfs/119 +1
-0@@ -20,6 +20,7 @@ _begin_fstest log v2log auto freeze _supported_fs xfs _require_scratch +_require_freeze # this may hang synctests/xfs/318 +2
-1@@ -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=64tests/xfs/325 +2
-1@@ -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=30tests/xfs/422 +2
-1@@ -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>&1tests/xfs/438 +1
-1@@ -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()tests/xfs/517 +1
-0@@ -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>&1Signature · 1 line
2.25.1
PATCH v2 2/3 fstests: unfreeze fs on cleanup routines
In reply to Amir GoldsteinMany of tests that freeze fs do not make sure that fs is unfrozen on test termination.
Some tests also need to kill and wait for writer processes after unfreezing the fs.
--- tests/generic/068 | 14 ++++++++++---- tests/generic/085 | 3 +++ tests/generic/280 | 13 ++++++++++++- tests/generic/390 | 8 +++++++- tests/generic/459 | 2 ++ tests/generic/491 | 9 +++++++++ tests/xfs/011 | 3 ++- tests/xfs/119 | 9 +++++++++ tests/xfs/297 | 11 +++++++++++ tests/xfs/318 | 3 ++- tests/xfs/325 | 3 ++- tests/xfs/438 | 2 ++ 12 files changed, 71 insertions(+), 9 deletions(-)
tests/generic/068 +10 -4
@@ -17,9 +17,12 @@ ITERATIONS=10 # Override the default cleanup function. _cleanup() { - cd / - - trap 0 1 2 3 15 + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + [ -n "$pid" ] && kill -9 $pid 2>/dev/null + wait $pid + cd / + rm -f $tmp.* } # Import common functions.
@@ -60,6 +63,7 @@ touch $tmp.running rm -r $STRESS_DIR/* rmdir $STRESS_DIR } & +pid=$! # start fstest -m loop in a background block; this gets us mmap coverage {
@@ -75,6 +79,7 @@ touch $tmp.running rm -rf $FSTEST_DIR/* rmdir $FSTEST_DIR } & +pid="$pid $!" i=0 let ITERATIONS=$ITERATIONS-1
@@ -103,6 +108,7 @@ done rm $tmp.running # wait for fsstresses to finish -wait +wait $pid +unset pid exit 1
tests/generic/085 +3 -0
@@ -25,6 +25,8 @@ cleanup_dmdev() { # in case it's still suspended and/or mounted $DMSETUP_PROG resume $lvdev >/dev/null 2>&1 + [ -n "$pid" ] && kill -9 $pid 2>/dev/null + wait $pid $UMOUNT_PROG $lvdev >/dev/null 2>&1 _dmsetup_remove $node }
@@ -75,6 +77,7 @@ done & pid="$pid $!" wait $pid +unset pid status=0 exit
tests/generic/280 +12 -1
@@ -10,6 +10,17 @@ . ./common/preamble _begin_fstest auto quota freeze +# Override the default cleanup function. +_cleanup() +{ + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + [ -n "$pid" ] && kill -9 $pid 2>/dev/null + wait $pid + cd / + rm -f $tmp.* +} + # Import common functions. . ./common/filter . ./common/quota
@@ -34,7 +45,7 @@ pid=$! sleep 1 xfs_freeze -u $SCRATCH_MNT wait $pid -_scratch_unmount +unset pid # Failure comes in the form of a deadlock.
tests/generic/390 +7 -1
@@ -14,8 +14,12 @@ _begin_fstest auto freeze stress _cleanup() { cd / - # Make sure $SCRATCH_MNT is unfreezed + # Kill freeze loops and make sure $SCRATCH_MNT is unfreezed + [ -n "$freeze_pids" ] && kill -9 $freeze_pids 2>/dev/null + wait $freeze_pids xfs_freeze -u $SCRATCH_MNT 2>/dev/null + [ -n "$fsstress_pid" ] && kill -9 $fsstress_pid 2>/dev/null + wait $fsstress_pid rm -f $tmp.* }
@@ -62,7 +66,9 @@ done wait $fsstress_pid result=$? +unset fsstress_pid wait $freeze_pids +unset freeze_pids # Exit with fsstress return value status=$result
tests/generic/459 +2 -0
@@ -24,6 +24,8 @@ _begin_fstest auto freeze thin # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null cd / rm -f $tmp.* $UMOUNT_PROG $SCRATCH_MNT >>$seqres.full 2>&1
tests/generic/491 +9 -0
@@ -12,6 +12,15 @@ . ./common/preamble _begin_fstest auto quick freeze mount +# Override the default cleanup function. +_cleanup() +{ + cd / + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + rm -f $tmp.* +} + # Import common functions. . ./common/filter
tests/xfs/011 +2 -1
@@ -16,10 +16,11 @@ _begin_fstest auto freeze log metadata quick # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null $KILLALL_PROG -9 fsstress 2>/dev/null wait cd / - _scratch_unmount 2>/dev/null rm -f $tmp.* }
tests/xfs/119 +9 -0
@@ -11,6 +11,15 @@ . ./common/preamble _begin_fstest log v2log auto freeze +# Override the default cleanup function. +_cleanup() +{ + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + cd / + rm -f $tmp.* +} + # Import common functions. . ./common/filter
tests/xfs/297 +11 -0
@@ -11,6 +11,17 @@ . ./common/preamble _begin_fstest auto freeze +# Override the default cleanup function. +_cleanup() +{ + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + $KILLALL_PROG -q -9 $FSSTRESS_PROG + wait + cd / + rm -f $tmp.* +} + # Import common functions. . ./common/filter
tests/xfs/318 +2 -1
@@ -12,8 +12,9 @@ _begin_fstest auto quick rw freeze # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null cd / - _scratch_unmount > /dev/null 2>&1 rm -rf $tmp.* }
tests/xfs/325 +2 -1
@@ -13,8 +13,9 @@ _begin_fstest auto quick clone freeze # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null cd / - _scratch_unmount > /dev/null 2>&1 rm -rf $tmp.* }
tests/xfs/438 +2 -0
@@ -26,6 +26,8 @@ _begin_fstest auto quick quota freeze # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null [ -z "${interval}" ] || \ sysctl -w fs.xfs.xfssyncd_centisecs=${interval} >/dev/null 2>&1 cd /
Signature · 1 line
2.25.1
Re: [PATCH v2 2/3] fstests: unfreeze fs on cleanup routines
Quoted 8 lines · Amir Goldstein
Many of tests that freeze fs do not make sure that fs is unfrozen on test termination.
Some tests also need to kill and wait for writer processes after unfreezing the fs.
Signed-off-by Amir Goldstein <[email protected]>---
The changes look good, and I didn't find regression issue from it for now. Please tell me your cencern if anyone has, or I'll merge it.
Quoted 277 lines
tests/generic/068 | 14 ++++++++++---- tests/generic/085 | 3 +++ tests/generic/280 | 13 ++++++++++++- tests/generic/390 | 8 +++++++- tests/generic/459 | 2 ++ tests/generic/491 | 9 +++++++++ tests/xfs/011 | 3 ++- tests/xfs/119 | 9 +++++++++ tests/xfs/297 | 11 +++++++++++ tests/xfs/318 | 3 ++- tests/xfs/325 | 3 ++- tests/xfs/438 | 2 ++ 12 files changed, 71 insertions(+), 9 deletions(-)tests/generic/068 +10
-4@@ -17,9 +17,12 @@ ITERATIONS=10 # Override the default cleanup function. _cleanup() { - cd / - - trap 0 1 2 3 15 + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + [ -n "$pid" ] && kill -9 $pid 2>/dev/null + wait $pid + cd / + rm -f $tmp.* } # Import common functions.@@ -60,6 +63,7 @@ touch $tmp.running rm -r $STRESS_DIR/* rmdir $STRESS_DIR } & +pid=$! # start fstest -m loop in a background block; this gets us mmap coverage {@@ -75,6 +79,7 @@ touch $tmp.running rm -rf $FSTEST_DIR/* rmdir $FSTEST_DIR } & +pid="$pid $!" i=0 let ITERATIONS=$ITERATIONS-1@@ -103,6 +108,7 @@ done rm $tmp.running # wait for fsstresses to finish -wait +wait $pid +unset pid exit 1tests/generic/085 +3
-0@@ -25,6 +25,8 @@ cleanup_dmdev() { # in case it's still suspended and/or mounted $DMSETUP_PROG resume $lvdev >/dev/null 2>&1 + [ -n "$pid" ] && kill -9 $pid 2>/dev/null + wait $pid $UMOUNT_PROG $lvdev >/dev/null 2>&1 _dmsetup_remove $node }@@ -75,6 +77,7 @@ done & pid="$pid $!" wait $pid +unset pid status=0 exittests/generic/280 +12
-1@@ -10,6 +10,17 @@ . ./common/preamble _begin_fstest auto quota freeze +# Override the default cleanup function. +_cleanup() +{ + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + [ -n "$pid" ] && kill -9 $pid 2>/dev/null + wait $pid + cd / + rm -f $tmp.* +} + # Import common functions. . ./common/filter . ./common/quota@@ -34,7 +45,7 @@ pid=$! sleep 1 xfs_freeze -u $SCRATCH_MNT wait $pid -_scratch_unmount +unset pid # Failure comes in the form of a deadlock.tests/generic/390 +7
-1@@ -14,8 +14,12 @@ _begin_fstest auto freeze stress _cleanup() { cd / - # Make sure $SCRATCH_MNT is unfreezed + # Kill freeze loops and make sure $SCRATCH_MNT is unfreezed + [ -n "$freeze_pids" ] && kill -9 $freeze_pids 2>/dev/null + wait $freeze_pids xfs_freeze -u $SCRATCH_MNT 2>/dev/null + [ -n "$fsstress_pid" ] && kill -9 $fsstress_pid 2>/dev/null + wait $fsstress_pid rm -f $tmp.* }@@ -62,7 +66,9 @@ done wait $fsstress_pid result=$? +unset fsstress_pid wait $freeze_pids +unset freeze_pids # Exit with fsstress return value status=$resulttests/generic/459 +2
-0@@ -24,6 +24,8 @@ _begin_fstest auto freeze thin # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null cd / rm -f $tmp.* $UMOUNT_PROG $SCRATCH_MNT >>$seqres.full 2>&1tests/generic/491 +9
-0@@ -12,6 +12,15 @@ . ./common/preamble _begin_fstest auto quick freeze mount +# Override the default cleanup function. +_cleanup() +{ + cd / + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + rm -f $tmp.* +} + # Import common functions. . ./common/filtertests/xfs/011 +2
-1@@ -16,10 +16,11 @@ _begin_fstest auto freeze log metadata quick # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null $KILLALL_PROG -9 fsstress 2>/dev/null wait cd / - _scratch_unmount 2>/dev/null rm -f $tmp.* }tests/xfs/119 +9
-0@@ -11,6 +11,15 @@ . ./common/preamble _begin_fstest log v2log auto freeze +# Override the default cleanup function. +_cleanup() +{ + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + cd / + rm -f $tmp.* +} + # Import common functions. . ./common/filtertests/xfs/297 +11
-0@@ -11,6 +11,17 @@ . ./common/preamble _begin_fstest auto freeze +# Override the default cleanup function. +_cleanup() +{ + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null + $KILLALL_PROG -q -9 $FSSTRESS_PROG + wait + cd / + rm -f $tmp.* +} + # Import common functions. . ./common/filtertests/xfs/318 +2
-1@@ -12,8 +12,9 @@ _begin_fstest auto quick rw freeze # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null cd / - _scratch_unmount > /dev/null 2>&1 rm -rf $tmp.* }tests/xfs/325 +2
-1@@ -13,8 +13,9 @@ _begin_fstest auto quick clone freeze # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null cd / - _scratch_unmount > /dev/null 2>&1 rm -rf $tmp.* }tests/xfs/438 +2
-0@@ -26,6 +26,8 @@ _begin_fstest auto quick quota freeze # Override the default cleanup function. _cleanup() { + # Make sure $SCRATCH_MNT is unfreezed + xfs_freeze -u $SCRATCH_MNT 2>/dev/null [ -z "${interval}" ] || \ sysctl -w fs.xfs.xfssyncd_centisecs=${interval} >/dev/null 2>&1 cd /Signature · 1 line
2.25.1
PATCH v2 3/3 xfs/{422,517}: kill background jobs on test termination
In reply to Amir GoldsteinThose tests failed to cleanup background jobs properly after test is interrupted and even sometimes when it completed succefully.
xfs/517 would sometime fails randomally with this false positive error:
QA output created by 517
Format and populate
Concurrent fsmap and freeze
+Terminated
Test done
The tests have several background sub-shells that spawn short lived programs in a loop. By killing the spawned programs using killall, killall could find no process to kill and the sub-shell loop could still spawn another process that is not going to be killed and in the worst case, the freeze_loop() could spawn the xfs_io "freeze" command after test has thawn the fs before exit, which leaves the fs frozen after the test.
The "Terminated" output is emitted by the sub-shell when killing the programs that it has spawned when the loop did not finish before test timeout. By killing the sub-shell and not the spawned programs, we avoid the false positive "Terminated" error.
Use a helper to perform this cleanup dance:
First kill and wait the freeze_loop so it won't try to freeze fs again Then make sure fs is not frozen.
Then kill and wait for the rest of the sub-shells, because if fs is frozen a killed writer process will never exit.
--- tests/xfs/422 | 32 ++++++++++++++++++++++++++++++-- tests/xfs/517 | 26 +++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 5 deletions(-)
tests/xfs/422 +30 -2
@@ -13,6 +13,32 @@ _begin_fstest dangerous_scrub dangerous_online_repair freeze _register_cleanup "_cleanup" BUS +# First kill and wait the freeze loop so it won't try to freeze fs again +# Then make sure fs is not frozen +# Then kill and wait for the rest of the workers +# Because if fs is frozen a killed writer will never exit +kill_loops() { + local sig=$1 + + [ -n "$freeze_pid" ] && kill $sig $freeze_pid + wait $freeze_pid + unset freeze_pid + $XFS_IO_PROG -x -c 'thaw' $SCRATCH_MNT + [ -n "$stress_pid" ] && kill $sig $stress_pid + [ -n "$repair_pid" ] && kill $sig $repair_pid + wait + unset stress_pid + unset repair_pid +} + +# Override the default cleanup function. +_cleanup() +{ + kill_loops -9 > /dev/null 2>&1 + cd / + rm -rf $tmp.* +} + # Import common functions. . ./common/filter . ./common/fuzzy
@@ -78,8 +104,11 @@ end=$((start + (30 * TIME_FACTOR) )) echo "Loop started at $(date --date="@${start}"), ending at $(date --date="@${end}")" >> $seqres.full stress_loop $end & +stress_pid=$! freeze_loop $end & +freeze_pid=$! repair_loop $end & +repair_pid=$! # Wait until 2 seconds after the loops should have finished... while [ "$(date +%s)" -lt $((end + 2)) ]; do
@@ -87,8 +116,7 @@ while [ "$(date +%s)" -lt $((end + 2)) ]; do done # ...and clean up after the loops in case they didn't do it themselves. -$KILLALL_PROG -TERM xfs_io fsstress >> $seqres.full 2>&1 -$XFS_IO_PROG -x -c 'thaw' $SCRATCH_MNT >> $seqres.full 2>&1 +kill_loops >> $seqres.full 2>&1 echo "Loop finished at $(date)" >> $seqres.full echo "Test done"
tests/xfs/517 +23 -3
@@ -11,11 +11,29 @@ _begin_fstest auto quick fsmap freeze _register_cleanup "_cleanup" BUS +# First kill and wait the freeze loop so it won't try to freeze fs again +# Then make sure fs is not frozen +# Then kill and wait for the rest of the workers +# Because if fs is frozen a killed writer will never exit +kill_loops() { + local sig=$1 + + [ -n "$freeze_pid" ] && kill $sig $freeze_pid + wait $freeze_pid + unset freeze_pid + $XFS_IO_PROG -x -c 'thaw' $SCRATCH_MNT + [ -n "$stress_pid" ] && kill $sig $stress_pid + [ -n "$fsmap_pid" ] && kill $sig $fsmap_pid + wait + unset stress_pid + unset fsmap_pid +} + # Override the default cleanup function. _cleanup() { + kill_loops -9 > /dev/null 2>&1 cd / - $XFS_IO_PROG -x -c 'thaw' $SCRATCH_MNT > /dev/null 2>&1 rm -rf $tmp.* }
@@ -83,8 +101,11 @@ end=$((start + (30 * TIME_FACTOR) )) echo "Loop started at $(date --date="@${start}"), ending at $(date --date="@${end}")" >> $seqres.full stress_loop $end & +stress_pid=$! freeze_loop $end & +freeze_pid=$! fsmap_loop $end & +fsmap_pid=$! # Wait until 2 seconds after the loops should have finished... while [ "$(date +%s)" -lt $((end + 2)) ]; do
@@ -92,8 +113,7 @@ while [ "$(date +%s)" -lt $((end + 2)) ]; do done # ...and clean up after the loops in case they didn't do it themselves. -$KILLALL_PROG -TERM xfs_io fsstress >> $seqres.full 2>&1 -$XFS_IO_PROG -x -c 'thaw' $SCRATCH_MNT >> $seqres.full 2>&1 +kill_loops >> $seqres.full 2>&1 echo "Loop finished at $(date)" >> $seqres.full echo "Test done"
Signature · 1 line
2.25.1