From owner-svn-src-projects@freebsd.org Thu Feb 8 21:58:21 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 75095F089F8 for ; Thu, 8 Feb 2018 21:58:21 +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 22D4480ACE; Thu, 8 Feb 2018 21:58:21 +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 1DD181BE4B; Thu, 8 Feb 2018 21:58:21 +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 w18LwLGh083922; Thu, 8 Feb 2018 21:58:21 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18LwKIe083920; Thu, 8 Feb 2018 21:58:20 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802082158.w18LwKIe083920@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 8 Feb 2018 21:58:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329044 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: userquota zil X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests: userquota zil X-SVN-Commit-Revision: 329044 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: Thu, 08 Feb 2018 21:58:21 -0000 Author: asomers Date: Thu Feb 8 21:58:20 2018 New Revision: 329044 URL: https://svnweb.freebsd.org/changeset/base/329044 Log: Fix the userquota and zil cleanups when no disks are defined tests/sys/cddl/zfs/tests/userquota/cleanup.ksh tests/sys/cddl/zfs/tests/zil/cleanup.ksh Don't do extraneous stuff during cleanup, and don't try to clear a disk label if there is no $DISK. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh Thu Feb 8 21:57:35 2018 (r329043) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/userquota/cleanup.ksh Thu Feb 8 21:58:20 2018 (r329044) @@ -34,10 +34,6 @@ if ! is_userquota_supported; then log_unsupported "userquota is not supported in this system." fi -log_must cleanup_quota log_must clean_user_group - -typeset mntp=$(get_prop mountpoint $QFS) -log_must $CHMOD 0755 $mntp default_cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh Thu Feb 8 21:57:35 2018 (r329043) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/cleanup.ksh Thu Feb 8 21:58:20 2018 (r329044) @@ -33,4 +33,5 @@ # clear its label with labelclear instead of relying on zpool destroy DISK=${DISKS%% *} $ZPOOL destroy -f $TESTPOOL -$ZPOOL labelclear -f $DISK +[ -n "$DISK" ] && $ZPOOL labelclear -f $DISK +log_pass