Skip to content

Commit

Permalink
Fix reservation test cases for large disks
Browse files Browse the repository at this point in the history
Convert explicit `typeset -i` and `typeset -l` declarations to
`typeset` in order to prevent 32-bit overflow from occurs with
disks >2G.

TEST_ZFSTESTS_DISKSIZE=4G

Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes openzfs#5715 
Closes openzfs#5714
  • Loading branch information
behlendorf authored and wli5 committed Feb 27, 2017
1 parent b43189f commit cdd1387
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
44 changes: 22 additions & 22 deletions tests/zfs-tests/tests/functional/reservation/reservation.shlib
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ function zero_reservation
#
function within_limits
{
typeset -l valA=$1
typeset -l valB=$2
typeset -l delta=$3
typeset valA=$1
typeset valB=$2
typeset delta=$3

if ((valA <= valB)); then
if (((valB - valA) <= delta)); then
Expand Down Expand Up @@ -115,14 +115,14 @@ function create_multiple_fs # num_fs base_fs_name base_mnt_name
#
function floor_volsize #<largest_volsize> [volblksize]
{
typeset -l largest_volsize=$1
typeset -l volblksize=${2:-8192}
typeset largest_volsize=$1
typeset volblksize=${2:-8192}

if ((largest_volsize < volblksize)); then
log_fail "The largest_volsize must be greater than volblksize."
fi
typeset -l real_volsize
typeset -l n
typeset real_volsize
typeset n

((n = largest_volsize / volblksize))
((largest_volsize = volblksize * n))
Expand All @@ -142,26 +142,26 @@ function floor_volsize #<largest_volsize> [volblksize]
function volsize_to_reservation
{
typeset vol=$1
typeset -i volsize=$2
typeset volsize=$2

typeset -i DN_MAX_INDBLKSHIFT=14
typeset -i SPA_BLKPTRSHIFT=7
typeset -i SPA_DVAS_PER_BP=3
typeset DN_MAX_INDBLKSHIFT=14
typeset SPA_BLKPTRSHIFT=7
typeset SPA_DVAS_PER_BP=3

typeset -i DNODES_PER_LEVEL_SHIFT=$((DN_MAX_INDBLKSHIFT - \
typeset DNODES_PER_LEVEL_SHIFT=$((DN_MAX_INDBLKSHIFT - \
SPA_BLKPTRSHIFT))
typeset -i DNODES_PER_LEVEL=$((1 << $DNODES_PER_LEVEL_SHIFT))
typeset DNODES_PER_LEVEL=$((1 << $DNODES_PER_LEVEL_SHIFT))

if ds_is_volume $vol; then
typeset -i ncopies=$(get_prop copies $vol)
typeset -i volblocksize=$(get_prop volblocksize $vol)
typeset ncopies=$(get_prop copies $vol)
typeset volblocksize=$(get_prop volblocksize $vol)
else
typeset -i ncopies=1
typeset -i volblocksize=8192
typeset ncopies=1
typeset volblocksize=8192
fi
typeset -i nblocks=$((volsize / volblocksize))
typeset nblocks=$((volsize / volblocksize))

typeset -i numdb=7
typeset numdb=7
while ((nblocks > 1)); do
((nblocks += DNODES_PER_LEVEL - 1))
((nblocks /= DNODES_PER_LEVEL))
Expand All @@ -186,9 +186,9 @@ function volsize_to_reservation
function largest_volsize_from_pool
{
typeset pool=$1
typeset -i poolsize=$(get_prop available $pool)
typeset -i volsize=$poolsize
typeset -i nvolsize
typeset poolsize=$(get_prop available $pool)
typeset volsize=$poolsize
typeset nvolsize

while :; do
# knock 50M off the volsize each time through
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ sparsevol=$TESTPOOL/$TESTVOL2
log_must $ZFS create -V 64M $regvol
log_must $ZFS create -s -V 64M $sparsevol

typeset -i vsize=$(get_prop available $TESTPOOL)
typeset -i iterate=10
typeset -i regreserv
typeset -i sparsereserv
typeset -i volblocksize=$(get_prop volblocksize $regvol)
typeset -i blknum=0
typeset -i randomblknum
typeset vsize=$(get_prop available $TESTPOOL)
typeset iterate=10
typeset regreserv
typeset sparsereserv
typeset volblocksize=$(get_prop volblocksize $regvol)
typeset blknum=0
typeset randomblknum
((blknum = vsize / volblocksize))

while ((iterate > 1)); do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fs_child=$TESTPOOL/$TESTFS/$TESTFS

space_avail=$(get_prop available $fs)
reserv_val=$(get_prop reservation $fs)
typeset -l reservsize=$space_avail
typeset reservsize=$space_avail
((reservsize = reservsize / 2))
log_must $ZFS set reservation=$reservsize $fs

Expand Down

0 comments on commit cdd1387

Please sign in to comment.