From: Lukas Czerner <lczerner@redhat.com>
Date: Mon, 15 Jun 2020 10:52:36 +0000 (+0200)
Subject: generic/270: wait for fsstress processes to be killed
X-Git-Tag: v2022.05.01~766
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=aae8fbecf42b99581984f2d4ad7830e9e2f3f6d0;p=xfstests-dev.git

generic/270: wait for fsstress processes to be killed

Currently wait will do nothing, because $pid is empty due to the fact
that the command was ran on the background in a separate shell so we
never got the $! set.

This is causing unexpected test failures especially under low memory
due to the fact that the fsstress is still running when we are
checking and comparing quota usage.

Fix it by using -w argument for killall that will wait for all processes
to actually die before it exits.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
---

diff --git a/tests/generic/270 b/tests/generic/270
index 5092ffa4..55779f5e 100755
--- a/tests/generic/270
+++ b/tests/generic/270
@@ -38,7 +38,6 @@ _workout()
 	$SETCAP_PROG cap_chown=epi  $tmp.fsstress.bin
 
 	(su $qa_user -c "$tmp.fsstress.bin $args" &) > /dev/null 2>&1
-	pid=$!
 
 	echo "Run dd writers in parallel"
 	for ((i=0; i < num_iterations; i++))
@@ -50,8 +49,7 @@ _workout()
 		sleep $enospc_time
 	done
 
-	$KILLALL_PROG $tmp.fsstress.bin
-	wait $pid
+	$KILLALL_PROG -w $tmp.fsstress.bin
 }
 
 # real QA test starts here