From: Elena Gryaznova <elena.gryaznova@hpe.com>
Date: Fri, 10 Dec 2021 15:58:14 +0000 (+0300)
Subject: LU-15140 tests: cleanup of recovery-*-scale tests fails
X-Git-Tag: 2.14.57~49
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f252abc6690247ee9608dbde80238add0ecaed8c;p=fs%2Flustre-release.git

LU-15140 tests: cleanup of recovery-*-scale tests fails

Bash trap handler is executed only after completition of
current command, so under big I/O load it can be executed
after test and cleanup phase finished.

Run I/O load in background overcome bash limitation.

Test-Parameters: clientcount=6 mdtcount=2 mdscount=2 osscount=2 austeroptions=-R failover=true iscsi=1 env=FAILOVER_PERIOD=180 testlist=recovery-double-scale env=SLOW=yes
Test-Parameters: clientcount=5 mdtcount=2 mdscount=2 osscount=2 austeroptions=-R failover=true iscsi=1 env=FAILOVER_PERIOD=180 env=DURATION=82800 testlist=recovery-mds-scale env=SLOW=yes
Test-Parameters: clientcount=5 mdtcount=2 mdscount=2 osscount=2 austeroptions=-R failover=true iscsi=1 env=DURATION=82800 testlist=recovery-random-scale env=SLOW=yes
Signed-off-by: Andriy Skulysh <andriy.skulysh@hpe.com>
Signed-off-by: Elena Gryaznova <elena.gryaznova@hpe.com>
HPE-bug-id: LUS-2649
Reviewed-by: Vladimir Saveliev <vlaidimir.saveliev@hpe.com>
Reviewed-by: Alexander Zarochentsev <alexander.zarochentsev@hpe.com>
Change-Id: I3c91cac4d3f9af9863e8f48ba8a6bae02190ccb4
Reviewed-on: https://review.whamcloud.com/45824
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/run_dd.sh b/lustre/tests/run_dd.sh
index e805f62..1ec14ec 100755
--- a/lustre/tests/run_dd.sh
+++ b/lustre/tests/run_dd.sh
@@ -42,7 +42,7 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
 
 	df $TESTDIR || true
 	dd bs=4k count=$BLKS status=noxfer if=/dev/zero of=$TESTDIR/dd-file \
-								1>$LOG
+								1>$LOG & wait $!
 	if [ $? -eq 0 ]; then
 		echoerr "$(date +'%F %H:%M:%S'): dd succeeded"
 		cd $TMP
diff --git a/lustre/tests/run_tar.sh b/lustre/tests/run_tar.sh
index 0ea2ce9..9748949 100755
--- a/lustre/tests/run_tar.sh
+++ b/lustre/tests/run_tar.sh
@@ -50,7 +50,7 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
 		break
 	fi
 
-	do_tar
+	do_tar & wait $!
 	RC=$?
 	PREV_ERRORS=$(grep "exit delayed from previous errors" $LOG) || true
 	if [ $RC -ne 0 -a "$ERRORS_OK" -a "$PREV_ERRORS" ]; then
@@ -60,7 +60,7 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
 	if [ $RC -eq 0 ]; then
 		echoerr "$(date +'%F %H:%M:%S'): tar succeeded"
 		cd $TMP
-		rm -rf $TESTDIR
+		rm -rf $TESTDIR & wait $!
 		echoerr "$(date +'%F %H:%M:%S'): tar run finished"
 	else
 		echoerr "$(date +'%F %H:%M:%S'): tar failed"