From owner-svn-src-projects@freebsd.org Tue Dec 15 23:50:59 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 3E6B7A48C37 for ; Tue, 15 Dec 2015 23:50:59 +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 10BFA18FC; Tue, 15 Dec 2015 23:50:58 +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 tBFNowIm037621; Tue, 15 Dec 2015 23:50:58 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFNow55037620; Tue, 15 Dec 2015 23:50:58 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512152350.tBFNow55037620@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 15 Dec 2015 23:50:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292294 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub 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: Tue, 15 Dec 2015 23:50:59 -0000 Author: asomers Date: Tue Dec 15 23:50:57 2015 New Revision: 292294 URL: https://svnweb.freebsd.org/changeset/base/292294 Log: tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh Fix zpool_scrub_002_pos by reducing a race condition. The test checks that you can cancel a scrub, but zfs is too fast; the scrub completes before there is an opportunity to cancel it. I don't know of any way to close this race completely, so instead I'll just increase the amount of data to scrub, slowing down the scrub operation. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh Tue Dec 15 23:49:29 2015 (r292293) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh Tue Dec 15 23:50:57 2015 (r292294) @@ -37,7 +37,7 @@ default_mirror_setup_noexit $DISK1 $DISK mntpnt=$(get_prop mountpoint $TESTPOOL) typeset -i i=0 while ((i < 10)); do - log_must $MKFILE 200M $mntpnt/bigfile.$i + log_must $MKFILE 500M $mntpnt/bigfile.$i ((i += 1)) done