From owner-svn-src-projects@freebsd.org Wed Dec 16 19:30:46 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6AE5A496B8 for ; Wed, 16 Dec 2015 19:30:45 +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 mx1.freebsd.org (Postfix) with ESMTPS id C080D1010; Wed, 16 Dec 2015 19:30:45 +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 tBGJUind047537; Wed, 16 Dec 2015 19:30:44 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGJUiTn047536; Wed, 16 Dec 2015 19:30:44 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512161930.tBGJUiTn047536@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 16 Dec 2015 19:30:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292353 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set X-SVN-Group: projects 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.20 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: Wed, 16 Dec 2015 19:30:46 -0000 Author: asomers Date: Wed Dec 16 19:30:44 2015 New Revision: 292353 URL: https://svnweb.freebsd.org/changeset/base/292353 Log: Disable read-only testing of space usage properties. These properties (used, available, referenced) are easily influenced by internal machinations in ZFS, and currently cause random failures of this test when run on a system running the BP workers. The test itself checks that the properties can't be changed, and goes farther than just asserting that the 'zfs set' command fails: it also checks that the property's value still matches its original value. For some reason, however, background activity causes short-term changes in these values, that appear not to involve either an ioctl (at least one that would show up in 'zpool history') or filesystem accesses. This is hopefully still only temporary just to get the tests passing. Submitted by: Will Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/ro_props_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/ro_props_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/ro_props_001_pos.ksh Wed Dec 16 19:28:42 2015 (r292352) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/ro_props_001_pos.ksh Wed Dec 16 19:30:44 2015 (r292353) @@ -63,11 +63,36 @@ set -A values filesystem volume snapshot set -A dataset $TESTPOOL $TESTPOOL/$TESTFS $TESTPOOL/$TESTVOL \ $TESTPOOL/$TESTCTR/$TESTFS1 $TESTPOOL/$TESTFS@$TESTSNAP \ $TESTPOOL/$TESTVOL@$TESTSNAP -typeset ro_props="type used available avail creation referenced refer compressratio \ - mounted origin" -typeset snap_ro_props="volsize recordsize recsize quota reservation reserv mountpoint \ - sharenfs checksum compression compress atime devices exec readonly rdonly \ - setuid" + +typeset ro_props="type" +ro_props="$ro_props creation" +ro_props="$ro_props compressratio" +ro_props="$ro_props mounted" +ro_props="$ro_props origin" +# Uncomment these once the test ensures they can't be changed. +#ro_props="$ro_props used" +#ro_props="$ro_props available" +#ro_props="$ro_props avail" +#ro_props="$ro_props referenced" +#ro_props="$ro_props refer" + +typeset snap_ro_props="volsize" +snap_ro_props="$snap_ro_props recordsize" +snap_ro_props="$snap_ro_props recsize" +snap_ro_props="$snap_ro_props quota" +snap_ro_props="$snap_ro_props reservation" +snap_ro_props="$snap_ro_props reserv" +snap_ro_props="$snap_ro_props mountpoint" +snap_ro_props="$snap_ro_props sharenfs" +snap_ro_props="$snap_ro_props checksum" +snap_ro_props="$snap_ro_props compression" +snap_ro_props="$snap_ro_props compress" +snap_ro_props="$snap_ro_props atime" +snap_ro_props="$snap_ro_props devices" +snap_ro_props="$snap_ro_props exec" +snap_ro_props="$snap_ro_props readonly" +snap_ro_props="$snap_ro_props rdonly" +snap_ro_props="$snap_ro_props setuid" $ZFS upgrade -v > /dev/null 2>&1 if [[ $? -eq 0 ]]; then @@ -76,6 +101,7 @@ fi function cleanup { + poolexists $TESTPOOL && log_must $ZPOOL history $TESTPOOL datasetexists $TESTPOOL/$TESTVOL@$TESTSNAP && \ destroy_snapshot $TESTPOOL/$TESTVOL@$TESTSNAP datasetexists $TESTPOOL/$TESTFS@$TESTSNAP && \