From owner-svn-src-projects@freebsd.org Fri Sep 22 21:55:43 2017 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 4CC0EE1057B for ; Fri, 22 Sep 2017 21:55:43 +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 0F74B80598; Fri, 22 Sep 2017 21:55:42 +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 v8MLtgkE073135; Fri, 22 Sep 2017 21:55:42 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8MLtgpU073133; Fri, 22 Sep 2017 21:55:42 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709222155.v8MLtgpU073133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 22 Sep 2017 21:55:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323936 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd X-SVN-Commit-Revision: 323936 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.23 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, 22 Sep 2017 21:55:43 -0000 Author: asomers Date: Fri Sep 22 21:55:41 2017 New Revision: 323936 URL: https://svnweb.freebsd.org/changeset/base/323936 Log: Fix intermittency in zfsd degrade tests tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib Sync the file under test before corrupting the vdev, not after. tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Increase timeouts to 600s. On systems with a slow rootpool, the extra time is necessary. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib Fri Sep 22 20:01:12 2017 (r323935) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib Fri Sep 22 21:55:41 2017 (r323936) @@ -81,11 +81,12 @@ function corrupt_pool_vdev # do some IO on the pool log_must $DD if=/dev/zero of=$file bs=1024k count=128 + $FSYNC $file + # scribble on the underlying file to corrupt the vdev log_must $DD if=/dev/urandom of=$vdev bs=1024k count=64 conv=notrunc # Scrub the pool to detect the corruption - $SYNC log_must $ZPOOL scrub $pool wait_until_scrubbed $pool Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Fri Sep 22 20:01:12 2017 (r323935) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Fri Sep 22 21:55:41 2017 (r323936) @@ -58,7 +58,7 @@ zfsd_degrade_001_pos_head() { atf_set "descr" "ZFS will degrade a vdev that produces checksum errors" atf_set "require.progs" zpool zfsd - atf_set "timeout" 300 + atf_set "timeout" 600 } zfsd_degrade_001_pos_body() { @@ -86,7 +86,7 @@ zfsd_degrade_002_pos_head() { atf_set "descr" "ZFS will degrade a spare that produces checksum errors" atf_set "require.progs" zpool zfsd - atf_set "timeout" 300 + atf_set "timeout" 600 } zfsd_degrade_002_pos_body() {