aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilipe Manana <fdmanana@suse.com>2024-03-27 17:11:36 +0000
committerAnand Jain <anand.jain@oracle.com>2024-04-03 15:07:54 +0800
commit1237986570e10aa8fc8b70fcc013a834192a16ea (patch)
tree58abaefc5691b631a78ef8947f1a116e24906007
parentaa4799f3d2efa779f8d4e7a5f5deae4218b2780b (diff)
downloadxfstests-dev-1237986570e10aa8fc8b70fcc013a834192a16ea.tar.gz
btrfs/028: use the helper _btrfs_kill_stress_balance_pid
Now that there's a helper to kill a background process that is running _btrfs_stress_balance(), use it in btrfs/028. It's equivalent to the existing code in btrfs/028. Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: Anand Jain <anand.jain@oracle.com>
-rwxr-xr-xtests/btrfs/0289
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/btrfs/028 b/tests/btrfs/028
index d860974ec2..8fbe8887f8 100755
--- a/tests/btrfs/028
+++ b/tests/btrfs/028
@@ -44,12 +44,9 @@ balance_pid=$!
# 30s is enough to trigger bug
sleep $((30*$TIME_FACTOR))
-kill $fsstress_pid $balance_pid &> /dev/null
-wait
-
-# kill _btrfs_stress_balance can't end balance, so call btrfs balance cancel
-# to cancel running or paused balance.
-$BTRFS_UTIL_PROG balance cancel $SCRATCH_MNT &> /dev/null
+kill $fsstress_pid &> /dev/null
+wait $fsstress_pid &> /dev/null
+_btrfs_kill_stress_balance_pid $balance_pid
_run_btrfs_util_prog filesystem sync $SCRATCH_MNT