From 69f8e4b9660d498370a8693abaa291481efca544 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Fri, 30 Dec 2022 14:12:53 -0800 Subject: [PATCH] fuzzy: clean up scrub stress programs quietly In the cleanup function for online fsck stress test common code, send SIGINT instead of SIGTERM to the fsstress and xfs_io processes to kill them. bash prints 'Terminated' to the golden output when children die with SIGTERM, which can make a test fail, and we don't want a regular cleanup function being the thing that prevents the test from passing. Signed-off-by: Darrick J. Wong Reviewed-by: Zorro Lang Signed-off-by: Zorro Lang --- common/fuzzy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/fuzzy b/common/fuzzy index 979fa555..e5283156 100644 --- a/common/fuzzy +++ b/common/fuzzy @@ -381,7 +381,9 @@ _require_xfs_stress_online_repair() { # Clean up after the loops in case they didn't do it themselves. _scratch_xfs_stress_scrub_cleanup() { - $KILLALL_PROG -TERM xfs_io fsstress >> $seqres.full 2>&1 + # Send SIGINT so that bash won't print a 'Terminated' message that + # distorts the golden output. + $KILLALL_PROG -INT xfs_io fsstress >> $seqres.full 2>&1 $XFS_IO_PROG -x -c 'thaw' $SCRATCH_MNT >> $seqres.full 2>&1 } -- 2.47.3