From: Alex Zhuravlev <bzzz@whamcloud.com>
Date: Sun, 3 Oct 2021 06:52:27 +0000 (+0300)
Subject: LU-15011 tests: ost-pools to remove big files
X-Git-Tag: 2.14.56~156
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=ebed0531abed9512682574e44dd17f465fa9b04c

LU-15011 tests: ost-pools to remove big files

otherwise those files can affect subtest 29

Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: Ia07c10882aba97758a3d11965693134eb2238e9a
Reviewed-on: https://review.whamcloud.com/45120
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
---

diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh
index a10ca50..6ffda0e 100755
--- a/lustre/tests/ost-pools.sh
+++ b/lustre/tests/ost-pools.sh
@@ -302,6 +302,7 @@ test_1n() {
 	add_pool ${POOL}1234567 "OST0000" "$FSNAME-OST0000_UUID "
 	local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 	create_dir $POOL_ROOT ${POOL}1234567
+	stack_trap "rm -f $POOL_ROOT/file"
 	dd if=/dev/zero of=$POOL_ROOT/file bs=1M count=100
 	RC=$?; [[ $RC -eq 0 ]] ||
 		error "failed to write to $POOL_ROOT/file: $RC"
@@ -1274,6 +1275,7 @@ test_23a() {
 	if [ $? -eq 0 ]; then
 		$LFS quota -v -u $RUNAS_ID $dir
 		cancel_lru_locks osc
+		stack_trap "rm -f $file"
 		stat=$(LOCALE=C $RUNAS dd if=/dev/zero of=$file bs=$BUNIT_SZ \
 			count=$BUNIT_SZ seek=$((BUNIT_SZ*2)) 2>&1)
 		RC=$?