Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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: 0d5ceb8

Change-Id: Ib1c0e1a116a6802f2bf25d665be5c076ae07c8b8
Signed-off-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/30023
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
  • Loading branch information
Alex Zhuravlev authored and jhammond-intel committed Nov 17, 2017
1 parent ec51d73 commit 3c4cb65
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions lustre/tests/sanity.sh
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3c4cb65

Please sign in to comment.