From: Dave Chinner <dchinner@redhat.com>
Date: Mon, 11 Apr 2022 05:48:33 +0000 (+1000)
Subject: generic/019: kill background processes on interrupt
X-Git-Tag: v2022.05.01~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b560e18c6216149e47c5208df2727b01ba2ce49b;p=xfstests-dev.git

generic/019: kill background processes on interrupt

If you ctrl-c generic/019, it leaves fsstress processes running.
Kill them in the cleanup function so that they don't have to be
manually killed after interrupting the test.

While touching the _cleanup() function, make it do everything that
the generic _cleanup function it overrides does and fix the
indenting.

[Eryu: unset fs_pid and fio_pid after wait]

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/tests/generic/019 b/tests/generic/019
index db56dac1..854ba57d 100755
--- a/tests/generic/019
+++ b/tests/generic/019
@@ -53,8 +53,10 @@ stop_fail_scratch_dev()
 # Override the default cleanup function.
 _cleanup()
 {
-    disallow_fail_make_request
-    rm -f $tmp.*
+	kill $fs_pid $fio_pid &> /dev/null
+	disallow_fail_make_request
+	cd /
+	rm -r -f $tmp.*
 }
 
 RUN_TIME=$((20+10*$TIME_FACTOR))
@@ -138,6 +140,8 @@ _workout()
 	kill $fs_pid &> /dev/null
 	wait $fs_pid
 	wait $fio_pid
+	unset $fs_pid
+	unset $fio_pid
 
 	# We expect that broken FS still can be umounted
 	run_check _scratch_unmount