From: Alex Zhuravlev <bzzz@whamcloud.com>
Date: Mon, 13 Dec 2021 11:47:59 +0000 (+0300)
Subject: LU-15365 tests: conf-sanity/115 to cleanup properly
X-Git-Tag: 2.15.57~29
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0f97ba50c0f9ab951f51d307f3607d1e267825d0;p=fs%2Flustre-release.git

LU-15365 tests: conf-sanity/115 to cleanup properly

when /tmp can't fit large MDT filesystem the image
should be removed after all.

Test-Parameters: trivial testlist=conf-sanity env=ONLY=115
Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: Ifb0bd201156f4beb665f3c38aa02d44802b13bbf
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/45836
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Alex Deiter <alex.deiter@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 62b2cc2..773348a 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -9341,8 +9341,11 @@ test_115() {
 	local mds_opts="$(mkfs_opts mds1 $(mdsdevname 1))	 \
 		--mkfsoptions='-O ea_inode,^resize_inode,meta_bg \
 		-N 2247484000 -E lazy_itable_init' --device-size=$IMAGESIZE"
-	add mds1 $mds_opts --mgs --reformat $mdsdev ||
+	add mds1 $mds_opts --mgs --reformat $mdsdev || {
+		do_facet $SINGLEMDS \
+			"losetup -d $mdsdev && rm -f $mdsimgname"
 		skip_env "format large MDT failed"
+	}
 
 	local ostdev=$(ostdevname 1)