[PATCH] btrfs/255: add _cleanup function to kill the balance stress process

[PATCH] btrfs/255: add _cleanup function to kill the balance stress process

[fdmanana]

From: Filipe Manana <fdmanana@suse.com>

Currently if we interrupt the test and balance stress process is already
running, it keeps running after the test is interrupted, requiring the
user to manually kill the balance stress process before it can run any
fstest that uses the scratch device. So add a _cleanup function that
ensures the balance stress process is killed when the test is interrupted.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 tests/btrfs/255 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/btrfs/255 b/tests/btrfs/255
index 14c12904..fbcbf57c 100755
--- a/tests/btrfs/255
+++ b/tests/btrfs/255
@@ -12,6 +12,15 @@
 . ./common/preamble
 _begin_fstest auto qgroup balance
 
+_cleanup()
+{
+	cd /
+	rm -rf $tmp.*
+	if [ -n "$balance_pid" ]; then
+		_btrfs_kill_stress_balance_pid $balance_pid
+	fi
+}
+
 _require_scratch
 
 _scratch_mkfs >> $seqres.full 2>&1
@@ -40,8 +49,6 @@ for ((i = 0; i < 20; i++)); do
 	$BTRFS_UTIL_PROG quota disable $SCRATCH_MNT
 done
 
-_btrfs_kill_stress_balance_pid $balance_pid
-
 echo "Silence is golden"
 status=0
 exit
-- 
2.47.2

Re: [PATCH] btrfs/255: add _cleanup function to kill the balance stress process

[Qu Wenruo]

在 2026/9/18 01:22, fdmanana@kernel.org 写道:
> From: Filipe Manana <fdmanana@suse.com>
> 
> Currently if we interrupt the test and balance stress process is already
> running, it keeps running after the test is interrupted, requiring the
> user to manually kill the balance stress process before it can run any
> fstest that uses the scratch device. So add a _cleanup function that
> ensures the balance stress process is killed when the test is interrupted.
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu

> ---
>   tests/btrfs/255 | 11 +++++++++--
>   1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/btrfs/255 b/tests/btrfs/255
> index 14c12904..fbcbf57c 100755
> --- a/tests/btrfs/255
> +++ b/tests/btrfs/255
> @@ -12,6 +12,15 @@
>   . ./common/preamble
>   _begin_fstest auto qgroup balance
>   
> +_cleanup()
> +{
> +	cd /
> +	rm -rf $tmp.*
> +	if [ -n "$balance_pid" ]; then
> +		_btrfs_kill_stress_balance_pid $balance_pid
> +	fi
> +}
> +
>   _require_scratch
>   
>   _scratch_mkfs >> $seqres.full 2>&1
> @@ -40,8 +49,6 @@ for ((i = 0; i < 20; i++)); do
>   	$BTRFS_UTIL_PROG quota disable $SCRATCH_MNT
>   done
>   
> -_btrfs_kill_stress_balance_pid $balance_pid
> -
>   echo "Silence is golden"
>   status=0
>   exit

Re: [PATCH] btrfs/255: add _cleanup function to kill the balance stress process

[Zorro Lang]

On Thu, Sep 17, 2026 at 04:52:56PM +0100, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
> 
> Currently if we interrupt the test and balance stress process is already
> running, it keeps running after the test is interrupted, requiring the
> user to manually kill the balance stress process before it can run any
> fstest that uses the scratch device. So add a _cleanup function that
> ensures the balance stress process is killed when the test is interrupted.
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>
> ---

Makes sense to me, thanks!

Reviewed-by: Zorro Lang <zlang@kernel.org>

>  tests/btrfs/255 | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/btrfs/255 b/tests/btrfs/255
> index 14c12904..fbcbf57c 100755
> --- a/tests/btrfs/255
> +++ b/tests/btrfs/255
> @@ -12,6 +12,15 @@
>  . ./common/preamble
>  _begin_fstest auto qgroup balance
>  
> +_cleanup()
> +{
> +	cd /
> +	rm -rf $tmp.*
> +	if [ -n "$balance_pid" ]; then
> +		_btrfs_kill_stress_balance_pid $balance_pid
> +	fi
> +}
> +
>  _require_scratch
>  
>  _scratch_mkfs >> $seqres.full 2>&1
> @@ -40,8 +49,6 @@ for ((i = 0; i < 20; i++)); do
>  	$BTRFS_UTIL_PROG quota disable $SCRATCH_MNT
>  done
>  
> -_btrfs_kill_stress_balance_pid $balance_pid
> -
>  echo "Silence is golden"
>  status=0
>  exit
> -- 
> 2.47.2
> 
>