From 76c696d545677bab4ce9641b9eff338fe99f6396 Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Mon, 8 Aug 2016 10:52:08 -0400 Subject: [PATCH] LU-7803 tests: Cleanup after sanity/78 Remove large file created by sanity/78 regardless of failure. If this file is left after failure, it causes some cascading failures because of limited space available. Signed-off-by: Nathaniel Clark Change-Id: Ib359b9024360015ce92f209e5350f2d679071cb8 Reviewed-on: http://review.whamcloud.com/21808 Tested-by: Jenkins Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index f4cbf84..6dde8ab 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -6155,6 +6155,11 @@ run_test 77j "client only supporting ADLER32" rm -f $F77_TMP unset F77_TMP +cleanup_test_78() { + trap 0 + rm -f $DIR/$tfile +} + test_78() { # bug 10901 [ $PARALLEL == "yes" ] && skip "skip parallel run" && return remote_ost || { skip_env "local OST" && return; } @@ -6184,6 +6189,8 @@ test_78() { # bug 10901 [[ $SMALLESTOST -lt 10240 ]] && skip "too small OSTSIZE, useless to run large O_DIRECT test" && return 0 + trap cleanup_test_78 EXIT + [[ $F78SIZE -gt $((SMALLESTOST * $OSTCOUNT / 1024 - 80)) ]] && F78SIZE=$((SMALLESTOST * $OSTCOUNT / 1024 - 80)) @@ -6196,7 +6203,7 @@ test_78() { # bug 10901 $DIRECTIO rdwr $DIR/$tfile 0 $FSIZE 1048576||error "rdwr failed" done - rm -f $DIR/$tfile + cleanup_test_78 } run_test 78 "handle large O_DIRECT writes correctly ============" -- 1.8.3.1