From owner-svn-src-projects@freebsd.org Thu Feb 15 00:23:14 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 483EBF0A132 for ; Thu, 15 Feb 2018 00:23:14 +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 ECF6F75E76; Thu, 15 Feb 2018 00:23:13 +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 E7E0517282; Thu, 15 Feb 2018 00:23:13 +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 w1F0NDbh027782; Thu, 15 Feb 2018 00:23:13 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1F0NDAs027780; Thu, 15 Feb 2018 00:23:13 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802150023.w1F0NDAs027780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 15 Feb 2018 00:23:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329293 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC X-SVN-Commit-Revision: 329293 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, 15 Feb 2018 00:23:14 -0000 Author: asomers Date: Thu Feb 15 00:23:13 2018 New Revision: 329293 URL: https://svnweb.freebsd.org/changeset/base/329293 Log: Fix a cleanup timeout in zvol_ENOSPC_001_pos Kyua has a hardcoded 60s timeout in the cleanup phase, and unmounting a full UFS filesystem is apparently a slow prospect. Move the unmount into the test's body. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/cleanup.ksh Thu Feb 15 00:21:53 2018 (r329292) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/cleanup.ksh Thu Feb 15 00:23:13 2018 (r329293) @@ -32,11 +32,6 @@ verify_runnable "global" -ismounted $TESTDIR ufs -(( $? == 0 )) && log_must $UMOUNT -f $TESTDIR - -[[ -e $TESTDIR ]] && $RM -rf $TESTDIR - default_zvol_cleanup log_pass Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh Thu Feb 15 00:21:53 2018 (r329292) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos.ksh Thu Feb 15 00:23:13 2018 (r329293) @@ -60,7 +60,11 @@ verify_runnable "global" function cleanup { - $RM -rf $TESTDIR/* + # unmounting the UFS filesystem can take more than 60s, and Kyua has a + # hardcoded 60s limit for the cleanup phase. So we must unmount the + # filesystem here rather than cleanup.ksh. + ismounted $TESTDIR ufs && log_must $UMOUNT -f $TESTDIR + $RMDIR $TESTDIR } log_assert "A zvol volume will return ENOSPC when the underlying pool " \