From 3c4cb654139842d99eb902e1703b965fc0603ced Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Thu, 28 Sep 2017 14:34:33 +0300 Subject: [PATCH] LU-10041 tests: sanity/51 to cleanup properly sanity/51 should cleanup properly in case of failure Test-Parameters: trivial testlist=sanity ostfilesystemtype=zfs mdtfilesystemtype=zfs Test-Parameters: trivial testlist=sanity mdscount=2 mdtcount=4 Lustre-change: https://review.whamcloud.com/29246 Lustre-commit: 0d5ceb891e904cc9bab3a6b5ce0944b8bab06975 Change-Id: Ib1c0e1a116a6802f2bf25d665be5c076ae07c8b8 Signed-off-by: Alex Zhuravlev Reviewed-by: James Nunez Reviewed-by: Wei Liu Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/30023 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: John L. Hammond --- lustre/tests/sanity.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index d1c7c20f87e..43aa2f8d0d4 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -4153,11 +4153,13 @@ test_51b() { [[ $numfree -lt $nrdirs ]] && skip "not enough blocks ($numfree)" && return - trap cleanup_print_lfsdf EXIT + trap cleanup_print_lfs_df EXIT # create files - createmany -d $dir/d $nrdirs || + createmany -d $dir/d $nrdirs || { + unlinkmany $dir/d $nrdirs error "failed to create $nrdirs subdirs in MDT$mdtidx:$dir" + } # really created : nrdirs=$(ls -U $dir | wc -l) @@ -4266,8 +4268,10 @@ test_51f() { echo "left ulimit at $ulimit_old" fi - createmany -o -k -t 120 $DIR/$tdir/f $numfree || + createmany -o -k -t 120 $DIR/$tdir/f $numfree || { + unlinkmany $DIR/$tdir/f $numfree error "create+open $numfree files in $DIR/$tdir failed" + } ulimit -n $ulimit_old # if createmany exits at 120s there will be fewer than $numfree files