LU-10041 tests: sanity/51 to cleanup properly

sanity/51 should cleanup properly in case of failure

Change-Id: Ib1c0e1a116a6802f2bf25d665be5c076ae07c8b8
Signed-off-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-on: https://review.whamcloud.com/29246
Tested-by: Jenkins
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 77a577a..6c1b7ed 100755 (executable)
--- 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