From owner-svn-src-projects@freebsd.org Fri Feb 9 21:33:47 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8F89F03EF2 for ; Fri, 9 Feb 2018 21:33:47 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E1EA7A96C; Fri, 9 Feb 2018 21:33:47 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58DF7264D; Fri, 9 Feb 2018 21:33:47 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w19LXlS1094794; Fri, 9 Feb 2018 21:33:47 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w19LXlnU094793; Fri, 9 Feb 2018 21:33:47 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802092133.w19LXlnU094793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 9 Feb 2018 21:33:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329084 - projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation X-SVN-Commit-Revision: 329084 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Feb 2018 21:33:47 -0000 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 ))