svn commit: r329084 - projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation

[Alan Somers]

Author: asomers
Date: Fri Feb  9 21:33:47 2018
New Revision: 329084
URL: https://svnweb.freebsd.org/changeset/base/329084

Log:
  Fix reservation_017_pos on systems more recent than FreeBSD 11.1
  
  At some point after when 11.1 was forked, I'm not sure exactly when, "zfs
  get" will show "-" for zvols with the default volblocksize of 8k.  Fix the
  test by explicitly specifying 16KB.  This test doesn't care about the exact
  value.
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_017_pos.ksh

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_017_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_017_pos.ksh	Fri Feb  9 21:13:20 2018	(r329083)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_017_pos.ksh	Fri Feb  9 21:33:47 2018	(r329084)
@@ -66,8 +66,8 @@ log_assert "Verify that the volsize changes of sparse 
 #Create a regular and sparse volume for testing.
 regvol=$TESTPOOL/$TESTVOL
 sparsevol=$TESTPOOL/$TESTVOL2
-log_must $ZFS create -V $VOLSIZE $regvol
-log_must $ZFS create -s -V $VOLSIZE $sparsevol
+log_must $ZFS create -V $VOLSIZE -o volblocksize=16k $regvol
+log_must $ZFS create -s -V $VOLSIZE -o volblocksize=16k $sparsevol
 
 typeset -l vsize=$(get_prop available $TESTPOOL)
 typeset -i iterate=10
@@ -76,7 +76,7 @@ typeset -l sparsereserv
 typeset -l vblksize1=$(get_prop volblocksize $regvol)
 typeset -l vblksize2=$(get_prop volblocksize $sparsevol)
 typeset -l blknum=0
-if (( $vblksize1 != $vblksize2 )); then
+if [ "$vblksize1" != "$vblksize2" ]; then
 	log_must $ZFS set volblocksize=$vblksize1 $sparsevol
 fi
 (( blknum = vsize / vblksize1 ))